Merge branch 'v1.5' into master

integration/grpc_test.go

@@ -1,6 +1,7 @@
 package integration
 
 import (
+	"context"
 	"crypto/rand"
 	"crypto/tls"
 	"crypto/x509"
@@ -13,7 +14,6 @@ import (
 	"github.com/containous/traefik/integration/helloworld"
 	"github.com/containous/traefik/integration/try"
 	"github.com/go-check/check"
-	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"
 )

integration/helloworld/helloworld.pb.go

@@ -20,7 +20,8 @@ import fmt "fmt"
 import math "math"
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+
 	grpc "google.golang.org/grpc"
 )