diff --git a/Gopkg.lock b/Gopkg.lock
index cff4afd749d1d..ad49aa462ebdd 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -23,7 +23,8 @@
     "appinsights",
     "appinsights/contracts"
   ]
-  revision = "3612f58550c1de70f1a110c78c830e55f29aa65d"
+  revision = "d2df5d440eda5372f24fcac03839a64d6cb5f7e5"
+  version = "v0.4.2"
 
 [[projects]]
   name = "github.com/Microsoft/go-winio"
@@ -34,18 +35,14 @@
 [[projects]]
   name = "github.com/Shopify/sarama"
   packages = ["."]
-  revision = "3b1b38866a79f06deddf0487d5c27ba0697ccd65"
-
-[[projects]]
-  name = "github.com/Sirupsen/logrus"
-  packages = ["."]
-  revision = "c155da19408a8799da419ed3eeb0cb5db0ad5dbc"
-  version = "v1.0.5"
+  revision = "35324cf48e33d8260e1c7c18854465a904ade249"
+  version = "v1.17.0"
 
 [[projects]]
   name = "github.com/StackExchange/wmi"
   packages = ["."]
-  revision = "f3e2bae1e0cb5aef83e319133eabfee30013a4a5"
+  revision = "5d049714c4a64225c3c79a7cf7d02f7fb5b96338"
+  version = "1.0.0"
 
 [[projects]]
   name = "github.com/aerospike/aerospike-client-go"
@@ -65,6 +62,21 @@
   revision = "c10b5393e43bd60125aca6289c7b24879edb1787"
   version = "v1.33.0"
 
+[[projects]]
+  branch = "master"
+  name = "github.com/alecthomas/template"
+  packages = [
+    ".",
+    "parse"
+  ]
+  revision = "a0175ee3bccc567396460bf5acd36800cb10c49c"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/alecthomas/units"
+  packages = ["."]
+  revision = "2efee857e7cfd4f3d0138cc3cbb1b4966962b93a"
+
 [[projects]]
   branch = "master"
   name = "github.com/amir/raidman"
@@ -77,7 +89,8 @@
 [[projects]]
   name = "github.com/apache/thrift"
   packages = ["lib/go/thrift"]
-  revision = "4aaa92ece8503a6da9bc6701604f69acf2b99d07"
+  revision = "327ebb6c2b6df8bf075da02ef45a2a034e9b79ba"
+  version = "0.11.0"
 
 [[projects]]
   name = "github.com/aws/aws-sdk-go"
@@ -92,12 +105,15 @@
     "aws/credentials/ec2rolecreds",
     "aws/credentials/endpointcreds",
     "aws/credentials/stscreds",
+    "aws/csm",
     "aws/defaults",
     "aws/ec2metadata",
     "aws/endpoints",
     "aws/request",
     "aws/session",
     "aws/signer/v4",
+    "internal/sdkio",
+    "internal/sdkrand",
     "internal/shareddefaults",
     "private/protocol",
     "private/protocol/json/jsonutil",
@@ -110,7 +126,8 @@
     "service/kinesis",
     "service/sts"
   ]
-  revision = "c861d27d0304a79f727e9a8a4e2ac1e74602fdc0"
+  revision = "bfc1a07cf158c30c41a3eefba8aae043d0bb5bff"
+  version = "v1.14.8"
 
 [[projects]]
   branch = "master"
@@ -121,7 +138,8 @@
 [[projects]]
   name = "github.com/bsm/sarama-cluster"
   packages = ["."]
-  revision = "abf039439f66c1ce78017f560b490612552f6472"
+  revision = "cf455bc755fe41ac9bb2861e7a961833d9c2ecc3"
+  version = "v2.1.13"
 
 [[projects]]
   name = "github.com/cenkalti/backoff"
@@ -130,9 +148,10 @@
   version = "v2.0.0"
 
 [[projects]]
+  branch = "master"
   name = "github.com/couchbase/go-couchbase"
   packages = ["."]
-  revision = "bfe555a140d53dc1adf390f1a1d4b0fd4ceadb28"
+  revision = "16db1f1fe037412f12738fa4d8448c549c4edd77"
 
 [[projects]]
   branch = "master"
@@ -161,7 +180,8 @@
 [[projects]]
   name = "github.com/dgrijalva/jwt-go"
   packages = ["."]
-  revision = "dbeaa9332f19a944acb5736b4456cfcc02140e29"
+  revision = "06ea1031745cb8b3dab3f6a236daf2b0aa468b7e"
+  version = "v3.2.0"
 
 [[projects]]
   name = "github.com/docker/distribution"
@@ -192,7 +212,8 @@
     "client",
     "pkg/tlsconfig"
   ]
-  revision = "f5ec1e2936dcbe7b5001c2b817188b095c700c27"
+  revision = "eef6495eddab52828327aade186443681ed71a4e"
+  version = "v17.03.2-ce-rc1"
 
 [[projects]]
   name = "github.com/docker/go-connections"
@@ -201,7 +222,8 @@
     "sockets",
     "tlsconfig"
   ]
-  revision = "990a1a1a70b0da4c4cb70e117971a4f0babfbf1a"
+  revision = "3ede32e2033de7505e6500d6c868c2b9ed9f169d"
+  version = "v0.3.0"
 
 [[projects]]
   name = "github.com/docker/go-units"
@@ -233,7 +255,8 @@
     ".",
     "packets"
   ]
-  revision = "aff15770515e3c57fc6109da73d42b0d46f7f483"
+  revision = "36d01c2b4cbeb3d2a12063e4880ce30800af9560"
+  version = "v1.1.1"
 
 [[projects]]
   name = "github.com/go-ini/ini"
@@ -269,11 +292,13 @@
     "internal/util"
   ]
   revision = "83fb42932f6145ce52df09860384a4653d2d332a"
+  version = "v6.12.0"
 
 [[projects]]
   name = "github.com/go-sql-driver/mysql"
   packages = ["."]
-  revision = "2e00b5cd70399450106cec6431c2e2ce3cae5034"
+  revision = "d523deb1b23d913de5bdada721a6071e71283618"
+  version = "v1.4.0"
 
 [[projects]]
   name = "github.com/gobwas/glob"
@@ -287,7 +312,8 @@
     "util/runes",
     "util/strings"
   ]
-  revision = "bea32b9cd2d6f55753d94a28e959b13f0244797a"
+  revision = "5ccd90ef52e1e632236f7326478d4faa74f99438"
+  version = "v0.2.3"
 
 [[projects]]
   name = "github.com/gogo/protobuf"
@@ -304,7 +330,8 @@
     "ptypes/duration",
     "ptypes/timestamp"
   ]
-  revision = "8ee79997227bf9b34611aee7946ae64735e6fd93"
+  revision = "b4deda0973fb4c70b50d226b1af49f3da59f5265"
+  version = "v1.1.0"
 
 [[projects]]
   branch = "master"
@@ -317,9 +344,11 @@
   packages = [
     "cmp",
     "cmp/internal/diff",
+    "cmp/internal/function",
     "cmp/internal/value"
   ]
-  revision = "f94e52cad91c65a63acc1e75d4be223ea22e99bc"
+  revision = "3af367b6b30c263d47e8895973edcca9a49cf029"
+  version = "v0.2.0"
 
 [[projects]]
   name = "github.com/gorilla/context"
@@ -330,7 +359,8 @@
 [[projects]]
   name = "github.com/gorilla/mux"
   packages = ["."]
-  revision = "53c1911da2b537f792e7cafcb446b05ffe33b996"
+  revision = "e3702bed27f0d39777b0b37b664b6280e8ef8fbf"
+  version = "v1.6.2"
 
 [[projects]]
   branch = "master"
@@ -342,6 +372,7 @@
   name = "github.com/hashicorp/consul"
   packages = ["api"]
   revision = "5174058f0d2bda63fa5198ab96c33d9a909c58ed"
+  version = "v1.1.0"
 
 [[projects]]
   branch = "master"
@@ -368,8 +399,10 @@
     "rfc5425"
   ]
   revision = "eecd51df3ad85464a2bab9b7d3a45bc1e299059e"
+  version = "v1.0.1"
 
 [[projects]]
+  branch = "master"
   name = "github.com/influxdata/tail"
   packages = [
     ".",
@@ -381,6 +414,7 @@
   revision = "c43482518d410361b6c383d7aebce33d0471d7bc"
 
 [[projects]]
+  branch = "master"
   name = "github.com/influxdata/toml"
   packages = [
     ".",
@@ -389,6 +423,7 @@
   revision = "2a2e3012f7cfbef64091cc79776311e65dfa211b"
 
 [[projects]]
+  branch = "master"
   name = "github.com/influxdata/wlog"
   packages = ["."]
   revision = "7c63b0a71ef8300adc255344d275e10e5c3a71ec"
@@ -404,13 +439,13 @@
     "pgtype",
     "stdlib"
   ]
-  revision = "63f58fd32edb5684b9e9f4cfaac847c6b42b3917"
+  revision = "da3231b0b66e2e74cdb779f1d46c5e958ba8be27"
+  version = "v3.1.0"
 
 [[projects]]
   name = "github.com/jmespath/go-jmespath"
   packages = ["."]
-  revision = "3433f3ea46d9f8019119e7dd41274e112a2359a9"
-  version = "0.2.2"
+  revision = "0b12d6b5"
 
 [[projects]]
   branch = "master"
@@ -419,14 +454,16 @@
   revision = "ae77be60afb1dcacde03767a8c37337fad28ac14"
 
 [[projects]]
+  branch = "master"
   name = "github.com/kardianos/service"
   packages = ["."]
-  revision = "6d3a0ee7d3425d9d835debc51a0ca1ffa28f4893"
+  revision = "615a14ed75099c9eaac6949e22ac2341bf9d3197"
 
 [[projects]]
+  branch = "master"
   name = "github.com/kballard/go-shellquote"
   packages = ["."]
-  revision = "d8ec1a69a250a17bb0e419c386eac1f3711dc142"
+  revision = "95032a82bc518f77982ea72343cc1ade730072f0"
 
 [[projects]]
   branch = "master"
@@ -434,15 +471,28 @@
   packages = ["."]
   revision = "b84e30acd515aadc4b783ad4ff83aff3299bdfe0"
 
+[[projects]]
+  branch = "master"
+  name = "github.com/mailru/easyjson"
+  packages = [
+    ".",
+    "buffer",
+    "jlexer",
+    "jwriter"
+  ]
+  revision = "3fdea8d05856a0c8df22ed4bc71b3219245e4485"
+
 [[projects]]
   name = "github.com/matttproud/golang_protobuf_extensions"
   packages = ["pbutil"]
   revision = "c12348ce28de40eed0136aa2b644d0ee0650e56c"
+  version = "v1.0.1"
 
 [[projects]]
   name = "github.com/miekg/dns"
   packages = ["."]
-  revision = "99f84ae56e75126dd77e5de4fae2ea034a468ca1"
+  revision = "5a2b9fab83ff0f8bfc99684bd5f43a37abe560f1"
+  version = "v1.0.8"
 
 [[projects]]
   branch = "master"
@@ -459,7 +509,8 @@
 [[projects]]
   name = "github.com/multiplay/go-ts3"
   packages = ["."]
-  revision = "07477f49b8dfa3ada231afc7b7b17617d42afe8e"
+  revision = "d0d44555495c8776880a17e439399e715a4ef319"
+  version = "v1.0.0"
 
 [[projects]]
   name = "github.com/naoina/go-stringutil"
@@ -476,7 +527,8 @@
     "server/pse",
     "util"
   ]
-  revision = "393bbb7c031433e68707c8810fda0bfcfbe6ab9b"
+  revision = "add6d7930ae6d4bff8823b28999ea87bf1bfd23d"
+  version = "v1.1.0"
 
 [[projects]]
   name = "github.com/nats-io/go-nats"
@@ -485,7 +537,8 @@
     "encoders/builtin",
     "util"
   ]
-  revision = "ea9585611a4ab58a205b9b125ebd74c389a6b898"
+  revision = "062418ea1c2181f52dc0f954f6204370519a868b"
+  version = "v1.5.0"
 
 [[projects]]
   name = "github.com/nats-io/nuid"
@@ -497,12 +550,7 @@
   name = "github.com/nsqio/go-nsq"
   packages = ["."]
   revision = "eee57a3ac4174c55924125bb15eeeda8cffb6e6f"
-
-[[projects]]
-  name = "github.com/opencontainers/runc"
-  packages = ["libcontainer/user"]
-  revision = "baf6536d6259209c3edfa2b22237af82942d3dfa"
-  version = "v0.1.1"
+  version = "v1.0.7"
 
 [[projects]]
   branch = "master"
@@ -524,13 +572,14 @@
   name = "github.com/openzipkin/zipkin-go-opentracing"
   packages = [
     ".",
-    "_thrift/gen-go/scribe",
-    "_thrift/gen-go/zipkincore",
     "flag",
+    "thrift/gen-go/scribe",
+    "thrift/gen-go/zipkincore",
     "types",
     "wire"
   ]
-  revision = "1cafbdfde94fbf2b373534764e0863aa3bd0bf7b"
+  revision = "26cf9707480e6b90e5eff22cf0bbf05319154232"
+  version = "v0.3.4"
 
 [[projects]]
   name = "github.com/pierrec/lz4"
@@ -559,14 +608,17 @@
     "prometheus",
     "prometheus/promhttp"
   ]
-  revision = "c317fb74746eac4fc65fe3909195f4cf67c5562a"
+  revision = "c5b7fccd204277076155f10851dad72b76a49317"
+  version = "v0.8.0"
 
 [[projects]]
+  branch = "master"
   name = "github.com/prometheus/client_model"
   packages = ["go"]
-  revision = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"
+  revision = "99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c"
 
 [[projects]]
+  branch = "master"
   name = "github.com/prometheus/common"
   packages = [
     "expfmt",
@@ -574,7 +626,7 @@
     "log",
     "model"
   ]
-  revision = "dd2f054febf4a6c00f2343686efb775948a8bff4"
+  revision = "7600349dcfe1abd18d72d3a1770870d9800a7801"
 
 [[projects]]
   branch = "master"
@@ -602,7 +654,8 @@
 [[projects]]
   name = "github.com/satori/go.uuid"
   packages = ["."]
-  revision = "5bf94b69c6b68ee1b541973bb8e1144db23a194b"
+  revision = "f58768cc1a7a7e77a3bd49e98cdd21419399b6a3"
+  version = "v1.2.0"
 
 [[projects]]
   name = "github.com/shirou/gopsutil"
@@ -616,7 +669,8 @@
     "net",
     "process"
   ]
-  revision = "c95755e4bcd7a62bb8bd33f3a597a7c7f35e2cf3"
+  revision = "eeb1d38d69593f121e060d24d17f7b1f0936b203"
+  version = "v2.18.05"
 
 [[projects]]
   branch = "master"
@@ -625,14 +679,22 @@
   revision = "bb4de0191aa41b5507caa14b0650cdbddcd9280b"
 
 [[projects]]
+  name = "github.com/sirupsen/logrus"
+  packages = ["."]
+  revision = "c155da19408a8799da419ed3eeb0cb5db0ad5dbc"
+  version = "v1.0.5"
+
+[[projects]]
+  branch = "master"
   name = "github.com/soniah/gosnmp"
   packages = ["."]
-  revision = "f15472a4cd6f6ea7929e4c7d9f163c49f059924f"
+  revision = "bcf840db66be7d64bf96c3c0e075c92e3d98f793"
 
 [[projects]]
+  branch = "master"
   name = "github.com/streadway/amqp"
   packages = ["."]
-  revision = "63795daa9a446c920826655f26ba31c81c860fd6"
+  revision = "e5adc2ada8b8efff032bf61173a233d143e9318e"
 
 [[projects]]
   name = "github.com/stretchr/objx"
@@ -647,12 +709,14 @@
     "mock",
     "require"
   ]
-  revision = "12b6f73e6084dad08a7c6e575284b177ecafbc71"
+  revision = "f35b8ab0b5a2cef36673838d662e249dd9c94686"
+  version = "v1.2.2"
 
 [[projects]]
   name = "github.com/tidwall/gjson"
   packages = ["."]
-  revision = "0623bd8fbdbf97cc62b98d15108832851a658e59"
+  revision = "afaeb9562041a8018c74e006551143666aed08bf"
+  version = "v1.1.1"
 
 [[projects]]
   branch = "master"
@@ -663,12 +727,14 @@
 [[projects]]
   name = "github.com/vjeantet/grok"
   packages = ["."]
-  revision = "d73e972b60935c7fec0b4ffbc904ed39ecaf7efe"
+  revision = "ce01e59abcf6fbc9833b7deb5e4b8ee1769bcc53"
+  version = "v1.0.0"
 
 [[projects]]
+  branch = "master"
   name = "github.com/wvanbergen/kafka"
   packages = ["consumergroup"]
-  revision = "bc265fedb9ff5b5c5d3c0fdcef4a819b3523d3ee"
+  revision = "e2edea948ddfee841ea9a263b32ccca15f7d6c2f"
 
 [[projects]]
   branch = "master"
@@ -688,9 +754,10 @@
   revision = "ca850f594eaafa5468da2bd53b865e4ee55be18b"
 
 [[projects]]
+  branch = "master"
   name = "github.com/zensqlmonitor/go-mssqldb"
   packages = ["."]
-  revision = "ffe5510c6fa5e15e6d983210ab501c815b56b363"
+  revision = "e8fbf836e44e86764eba398361d1825651709547"
 
 [[projects]]
   branch = "master"
@@ -698,32 +765,42 @@
   packages = [
     "bcrypt",
     "blowfish",
+    "ed25519",
+    "ed25519/internal/edwards25519",
     "md4",
     "pbkdf2",
     "ssh/terminal"
   ]
-  revision = "a8fb68e7206f8c78be19b432c58eb52a6aa34462"
+  revision = "027cca12c2d63e3d62b670d901e8a2c95854feec"
 
 [[projects]]
+  branch = "master"
   name = "golang.org/x/net"
   packages = [
+    "bpf",
     "context",
     "context/ctxhttp",
     "html",
     "html/atom",
     "html/charset",
+    "http/httpguts",
     "http2",
     "http2/hpack",
     "idna",
+    "internal/iana",
+    "internal/socket",
+    "internal/socks",
     "internal/timeseries",
-    "lex/httplex",
+    "ipv4",
+    "ipv6",
     "proxy",
     "trace",
     "websocket"
   ]
-  revision = "a337091b0525af65de94df2eb7e98bd9962dcbe2"
+  revision = "db08ff08e8622530d9ed3a0e8ac279f6d4c02196"
 
 [[projects]]
+  branch = "master"
   name = "golang.org/x/sys"
   packages = [
     "unix",
@@ -734,7 +811,7 @@
     "windows/svc/eventlog",
     "windows/svc/mgr"
   ]
-  revision = "739734461d1c916b6c72a63d7efda2b27edb369f"
+  revision = "6c888cc515d3ed83fc103cf1d84468aad274b0a7"
 
 [[projects]]
   name = "golang.org/x/text"
@@ -769,6 +846,12 @@
   revision = "f21a4dfb5e38f5895301dc265a8def02365cc3d0"
   version = "v0.3.0"
 
+[[projects]]
+  name = "google.golang.org/appengine"
+  packages = ["cloudsql"]
+  revision = "b1f26356af11148e710935ed1ac8a7f5702c7612"
+  version = "v1.1.0"
+
 [[projects]]
   branch = "master"
   name = "google.golang.org/genproto"
@@ -780,11 +863,14 @@
   packages = [
     ".",
     "balancer",
+    "balancer/base",
     "balancer/roundrobin",
+    "channelz",
     "codes",
     "connectivity",
     "credentials",
     "encoding",
+    "encoding/proto",
     "grpclb/grpc_lb_v1/messages",
     "grpclog",
     "internal",
@@ -800,7 +886,14 @@
     "tap",
     "transport"
   ]
-  revision = "de2209a968d48e8970546c8a710189f7461370f7"
+  revision = "7a6a684ca69eb4cae85ad0a484f2e531598c047b"
+  version = "v1.12.2"
+
+[[projects]]
+  name = "gopkg.in/alecthomas/kingpin.v2"
+  packages = ["."]
+  revision = "947dcec5ba9c011838740e680966fd7087a71d0d"
+  version = "v2.2.6"
 
 [[projects]]
   name = "gopkg.in/asn1-ber.v1"
@@ -829,14 +922,17 @@
     "ql2",
     "types"
   ]
-  revision = "7ab832f7b65573104a555d84a27992ae9ea1f659"
+  revision = "7f5bdfd858bb064d80559b2a32b86669c5de5d3b"
+  version = "v3.0.5"
 
 [[projects]]
   name = "gopkg.in/ldap.v2"
   packages = ["."]
-  revision = "8168ee085ee43257585e50c6441aadf54ecb2c9f"
+  revision = "bb7a9ca6e4fbc2129e3db588a34bc970ffe811a9"
+  version = "v2.5.1"
 
 [[projects]]
+  branch = "v2"
   name = "gopkg.in/mgo.v2"
   packages = [
     ".",
@@ -851,9 +947,11 @@
   name = "gopkg.in/olivere/elastic.v5"
   packages = [
     ".",
+    "config",
     "uritemplates"
   ]
-  revision = "3113f9b9ad37509fe5f8a0e5e91c96fdc4435e26"
+  revision = "b708306d715bea9b983685e94ab4602cdc9f988b"
+  version = "v5.0.69"
 
 [[projects]]
   branch = "v1"
@@ -864,11 +962,12 @@
 [[projects]]
   name = "gopkg.in/yaml.v2"
   packages = ["."]
-  revision = "4c78c975fe7c825c6d1466c42be594d1d6f3aba6"
+  revision = "5420a8b6744d3b0345ab293f6fcba19c978f1183"
+  version = "v2.2.1"
 
 [solve-meta]
   analyzer-name = "dep"
   analyzer-version = 1
-  inputs-digest = "c325d1e0698de2ac67192ab3cbc179b18a21eb32636bb1bdd6e5eba2f06084f9"
+  inputs-digest = "d6f5a0f8e2d2b1a63a34c104394aea56841db2d108d319991583da732215ab4d"
   solver-name = "gps-cdcl"
   solver-version = 1
diff --git a/Gopkg.toml b/Gopkg.toml
index b55bc1023407d..8a7255cb96581 100644
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -4,7 +4,7 @@
 
 [[constraint]]
   name = "github.com/aerospike/aerospike-client-go"
-  version = "^1.24.0"
+  version = "^1.33.0"
 
 [[constraint]]
   name = "github.com/amir/raidman"
@@ -12,211 +12,231 @@
 
 [[constraint]]
   name = "github.com/apache/thrift"
-  revision = "4aaa92ece8503a6da9bc6701604f69acf2b99d07"
+  version = "0.11.0"
 
 [[constraint]]
   name = "github.com/aws/aws-sdk-go"
-  revision = "c861d27d0304a79f727e9a8a4e2ac1e74602fdc0"
+  version = "1.14.8"
+#  version = "1.8.39"
 
 [[constraint]]
   name = "github.com/bsm/sarama-cluster"
-  revision = "abf039439f66c1ce78017f560b490612552f6472"
+  version = "2.1.13"
+#  version = "2.1.10"
 
 [[constraint]]
   name = "github.com/couchbase/go-couchbase"
-  revision = "bfe555a140d53dc1adf390f1a1d4b0fd4ceadb28"
+  branch = "master"
 
 [[constraint]]
   name = "github.com/dgrijalva/jwt-go"
-  revision = "dbeaa9332f19a944acb5736b4456cfcc02140e29"
+  version = "3.2.0"
+#  version = "3.1.0"
 
 [[constraint]]
   name = "github.com/docker/docker"
-  revision = "f5ec1e2936dcbe7b5001c2b817188b095c700c27"
+  version = "~17.03.2-ce"
 
 [[constraint]]
   name = "github.com/docker/go-connections"
-  revision = "990a1a1a70b0da4c4cb70e117971a4f0babfbf1a"
+  version = "0.3.0"
+#  version = "0.2.1"
 
 [[constraint]]
   name = "github.com/eclipse/paho.mqtt.golang"
-  revision = "aff15770515e3c57fc6109da73d42b0d46f7f483"
+  version = "~1.1.1"
+#  version = "1.1.0"
 
 [[constraint]]
   name = "github.com/go-sql-driver/mysql"
-  revision = "2e00b5cd70399450106cec6431c2e2ce3cae5034"
+  version = "1.4.0"
+#  version = "1.3.0"
 
 [[constraint]]
   name = "github.com/gobwas/glob"
-  revision = "bea32b9cd2d6f55753d94a28e959b13f0244797a"
+  version = "0.2.3"
+#  version = "0.2.2"
 
 [[constraint]]
   name = "github.com/golang/protobuf"
-  revision = "8ee79997227bf9b34611aee7946ae64735e6fd93"
+  version = "1.1.0"
+#  version = "1.0.0"
 
 [[constraint]]
   name = "github.com/google/go-cmp"
-  revision = "f94e52cad91c65a63acc1e75d4be223ea22e99bc"
+  version = "0.2.0"
+#  version = "0.1.0"
 
 [[constraint]]
   name = "github.com/gorilla/mux"
-  revision = "53c1911da2b537f792e7cafcb446b05ffe33b996"
+  version = "1.6.2"
+#  version = "1.6.1"
 
 [[constraint]]
   name = "github.com/go-redis/redis"
-  revision = "83fb42932f6145ce52df09860384a4653d2d332a"
+  version = "6.12.0"
 
 [[constraint]]
   name = "github.com/hashicorp/consul"
-  revision = "5174058f0d2bda63fa5198ab96c33d9a909c58ed"
+  version = "1.1.0"
 
 [[constraint]]
   name = "github.com/influxdata/go-syslog"
-  revision = "eecd51df3ad85464a2bab9b7d3a45bc1e299059e"
+  version = "1.0.1"
 
 [[constraint]]
   name = "github.com/influxdata/tail"
-  revision = "c43482518d410361b6c383d7aebce33d0471d7bc"
+  branch = "master"
 
 [[constraint]]
   name = "github.com/influxdata/toml"
-  revision = "2a2e3012f7cfbef64091cc79776311e65dfa211b"
+  branch = "master"
 
 [[constraint]]
   name = "github.com/influxdata/wlog"
-  revision = "7c63b0a71ef8300adc255344d275e10e5c3a71ec"
+  branch = "master"
 
 [[constraint]]
   name = "github.com/jackc/pgx"
-  revision = "63f58fd32edb5684b9e9f4cfaac847c6b42b3917"
+  version = "3.1.0"
 
 [[constraint]]
   name = "github.com/kardianos/service"
-  revision = "6d3a0ee7d3425d9d835debc51a0ca1ffa28f4893"
+  branch = "master"
 
 [[constraint]]
   name = "github.com/kballard/go-shellquote"
-  revision = "d8ec1a69a250a17bb0e419c386eac1f3711dc142"
+  branch = "master"
 
 [[constraint]]
   name = "github.com/matttproud/golang_protobuf_extensions"
-  revision = "c12348ce28de40eed0136aa2b644d0ee0650e56c"
+  version = "1.0.1"
 
 [[constraint]]
   name = "github.com/Microsoft/ApplicationInsights-Go"
-  revision = "3612f58550c1de70f1a110c78c830e55f29aa65d"
+  branch = "master"
 
 [[constraint]]
   name = "github.com/miekg/dns"
-  revision = "99f84ae56e75126dd77e5de4fae2ea034a468ca1"
+  version = "1.0.8"
+#  version = "1.0.0"
 
 [[constraint]]
   name = "github.com/multiplay/go-ts3"
-  revision = "07477f49b8dfa3ada231afc7b7b17617d42afe8e"
+  version = "1.0.0"
 
 [[constraint]]
   name = "github.com/nats-io/gnatsd"
-  revision = "393bbb7c031433e68707c8810fda0bfcfbe6ab9b"
+  version = "1.1.0"
+#  version = "1.0.4"
 
 [[constraint]]
   name = "github.com/nats-io/go-nats"
-  revision = "ea9585611a4ab58a205b9b125ebd74c389a6b898"
+  version = "1.5.0"
+#  version = "1.3.0"
 
 [[constraint]]
   name = "github.com/nsqio/go-nsq"
-  revision = "eee57a3ac4174c55924125bb15eeeda8cffb6e6f"
+  version = "1.0.7"
 
 [[constraint]]
   name = "github.com/openzipkin/zipkin-go-opentracing"
-  revision = "1cafbdfde94fbf2b373534764e0863aa3bd0bf7b"
+  version = "0.3.4"
+#  version = "0.3.0"
 
 [[constraint]]
   name = "github.com/prometheus/client_golang"
-  revision = "c317fb74746eac4fc65fe3909195f4cf67c5562a"
+  version = "0.8.0"
 
 [[constraint]]
   name = "github.com/prometheus/client_model"
-  revision = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"
+  branch = "master"
 
 [[constraint]]
   name = "github.com/prometheus/common"
-  revision = "dd2f054febf4a6c00f2343686efb775948a8bff4"
+  branch = "master"
 
 [[constraint]]
   name = "github.com/satori/go.uuid"
-  revision = "5bf94b69c6b68ee1b541973bb8e1144db23a194b"
+  version = "1.2.0"
 
 [[constraint]]
   name = "github.com/shirou/gopsutil"
-  revision = "c95755e4bcd7a62bb8bd33f3a597a7c7f35e2cf3"
+  version = "2.18.05"
+#  version = "2.18.04"
 
 [[constraint]]
   name = "github.com/Shopify/sarama"
-  revision = "3b1b38866a79f06deddf0487d5c27ba0697ccd65"
+  version = "1.17.0"
+#  version = "1.15.0"
 
 [[constraint]]
   name = "github.com/soniah/gosnmp"
-  revision = "f15472a4cd6f6ea7929e4c7d9f163c49f059924f"
+  branch = "master"
 
 [[constraint]]
   name = "github.com/StackExchange/wmi"
-  revision = "f3e2bae1e0cb5aef83e319133eabfee30013a4a5"
+  version = "1.0.0"
 
 [[constraint]]
   name = "github.com/streadway/amqp"
-  revision = "63795daa9a446c920826655f26ba31c81c860fd6"
+  branch = "master"
 
 [[constraint]]
   name = "github.com/stretchr/testify"
-  revision = "12b6f73e6084dad08a7c6e575284b177ecafbc71"
+  version = "1.2.2"
+#  version = "1.2.1"
 
 [[constraint]]
   name = "github.com/tidwall/gjson"
-  revision = "0623bd8fbdbf97cc62b98d15108832851a658e59"
+  version = "1.1.1"
+#  version = "1.0.0"
 
 [[constraint]]
   name = "github.com/vjeantet/grok"
-  revision = "d73e972b60935c7fec0b4ffbc904ed39ecaf7efe"
+  version = "1.0.0"
 
 [[constraint]]
   name = "github.com/wvanbergen/kafka"
-  revision = "bc265fedb9ff5b5c5d3c0fdcef4a819b3523d3ee"
+  branch = "master"
 
 [[constraint]]
   name = "github.com/zensqlmonitor/go-mssqldb"
-  revision = "ffe5510c6fa5e15e6d983210ab501c815b56b363"
+  branch = "master"
 
 [[constraint]]
   name = "golang.org/x/net"
-  revision = "a337091b0525af65de94df2eb7e98bd9962dcbe2"
+  branch = "master"
 
 [[constraint]]
   name = "golang.org/x/sys"
-  revision = "739734461d1c916b6c72a63d7efda2b27edb369f"
+  branch = "master"
 
 [[constraint]]
   name = "google.golang.org/grpc"
-  revision = "de2209a968d48e8970546c8a710189f7461370f7"
+  version = "1.12.2"
+#  version = "1.8.0"
 
 [[constraint]]
   name = "gopkg.in/gorethink/gorethink.v3"
-  revision = "7ab832f7b65573104a555d84a27992ae9ea1f659"
+  version = "3.0.5"
 
 [[constraint]]
   name = "gopkg.in/ldap.v2"
-  revision = "8168ee085ee43257585e50c6441aadf54ecb2c9f"
+  version = "2.5.1"
 
 [[constraint]]
   name = "gopkg.in/mgo.v2"
-  revision = "3f83fa5005286a7fe593b055f0d7771a7dce4655"
+  branch = "v2"
 
 [[constraint]]
   name = "gopkg.in/olivere/elastic.v5"
-  revision = "3113f9b9ad37509fe5f8a0e5e91c96fdc4435e26"
+  version = "^5.0.69"
+#  version = "^6.1.23"
 
 [[constraint]]
   name = "gopkg.in/yaml.v2"
-  revision = "4c78c975fe7c825c6d1466c42be594d1d6f3aba6"
+  version = "^2.2.1"
 
 [[override]]
   source = "https://github.com/fsnotify/fsnotify/archive/v1.4.7.tar.gz"
diff --git a/plugins/inputs/zipkin/cmd/thrift_serialize/thrift_serialize.go b/plugins/inputs/zipkin/cmd/thrift_serialize/thrift_serialize.go
index 0d792f926ebc1..60bf1b51ae6e5 100644
--- a/plugins/inputs/zipkin/cmd/thrift_serialize/thrift_serialize.go
+++ b/plugins/inputs/zipkin/cmd/thrift_serialize/thrift_serialize.go
@@ -32,7 +32,7 @@ import (
 	"log"
 
 	"github.com/apache/thrift/lib/go/thrift"
-	"github.com/openzipkin/zipkin-go-opentracing/_thrift/gen-go/zipkincore"
+	"github.com/openzipkin/zipkin-go-opentracing/thrift/gen-go/zipkincore"
 )
 
 var (
diff --git a/plugins/inputs/zipkin/codec/codec.go b/plugins/inputs/zipkin/codec/codec.go
index 781aad72aa73a..167b8ec24f1a3 100644
--- a/plugins/inputs/zipkin/codec/codec.go
+++ b/plugins/inputs/zipkin/codec/codec.go
@@ -4,7 +4,7 @@ import (
 	"time"
 
 	"github.com/influxdata/telegraf/plugins/inputs/zipkin/trace"
-	"github.com/openzipkin/zipkin-go-opentracing/_thrift/gen-go/zipkincore"
+	"github.com/openzipkin/zipkin-go-opentracing/thrift/gen-go/zipkincore"
 )
 
 //now is a mockable time for now
diff --git a/plugins/inputs/zipkin/codec/jsonV1/jsonV1.go b/plugins/inputs/zipkin/codec/jsonV1/jsonV1.go
index 8c229b9f315d5..1803486742301 100644
--- a/plugins/inputs/zipkin/codec/jsonV1/jsonV1.go
+++ b/plugins/inputs/zipkin/codec/jsonV1/jsonV1.go
@@ -7,7 +7,7 @@ import (
 	"time"
 
 	"github.com/influxdata/telegraf/plugins/inputs/zipkin/codec"
-	"github.com/openzipkin/zipkin-go-opentracing/_thrift/gen-go/zipkincore"
+	"github.com/openzipkin/zipkin-go-opentracing/thrift/gen-go/zipkincore"
 )
 
 // JSON decodes spans from  bodies `POST`ed to the spans endpoint
diff --git a/plugins/inputs/zipkin/codec/thrift/thrift.go b/plugins/inputs/zipkin/codec/thrift/thrift.go
index b3fc94897b4b3..65a9e1488c2c4 100644
--- a/plugins/inputs/zipkin/codec/thrift/thrift.go
+++ b/plugins/inputs/zipkin/codec/thrift/thrift.go
@@ -10,7 +10,7 @@ import (
 	"github.com/influxdata/telegraf/plugins/inputs/zipkin/codec"
 
 	"github.com/apache/thrift/lib/go/thrift"
-	"github.com/openzipkin/zipkin-go-opentracing/_thrift/gen-go/zipkincore"
+	"github.com/openzipkin/zipkin-go-opentracing/thrift/gen-go/zipkincore"
 )
 
 // UnmarshalThrift converts raw bytes in thrift format to a slice of spans
diff --git a/plugins/inputs/zipkin/codec/thrift/thrift_test.go b/plugins/inputs/zipkin/codec/thrift/thrift_test.go
index 4b239fdb34448..000ac628c767d 100644
--- a/plugins/inputs/zipkin/codec/thrift/thrift_test.go
+++ b/plugins/inputs/zipkin/codec/thrift/thrift_test.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/google/go-cmp/cmp"
 
-	"github.com/openzipkin/zipkin-go-opentracing/_thrift/gen-go/zipkincore"
+	"github.com/openzipkin/zipkin-go-opentracing/thrift/gen-go/zipkincore"
 )
 
 func Test_endpointHost(t *testing.T) {
diff --git a/plugins/outputs/mqtt/mqtt.go b/plugins/outputs/mqtt/mqtt.go
index 6231045b8a4e8..18e22daa60c4f 100644
--- a/plugins/outputs/mqtt/mqtt.go
+++ b/plugins/outputs/mqtt/mqtt.go
@@ -184,7 +184,7 @@ func (m *MQTT) publish(topic string, body []byte) error {
 
 func (m *MQTT) createOpts() (*paho.ClientOptions, error) {
 	opts := paho.NewClientOptions()
-	opts.KeepAlive = 0 * time.Second
+	opts.KeepAlive = 0
 
 	if m.Timeout.Duration < time.Second {
 		m.Timeout.Duration = 5 * time.Second