all: fix plugin import ordering (#1717)

Got a bit messed up with stb lib "context" usage.

plugin/etcd/etcd.go

@@ -2,6 +2,7 @@
 package etcd
 
 import (
+	"context"
 	"encoding/json"
 	"fmt"
 	"strings"
@@ -13,8 +14,6 @@ import (
 	"github.com/coredns/coredns/plugin/proxy"
 	"github.com/coredns/coredns/request"
 
-	"context"
-
 	"github.com/coredns/coredns/plugin/pkg/upstream"
 	etcdc "github.com/coreos/etcd/client"
 	"github.com/miekg/dns"

plugin/etcd/handler.go

@@ -1,12 +1,12 @@
 package etcd
 
 import (
+	"context"
+
 	"github.com/coredns/coredns/plugin"
 	"github.com/coredns/coredns/plugin/pkg/dnsutil"
 	"github.com/coredns/coredns/request"
 
-	"context"
-
 	"github.com/miekg/dns"
 )
 

plugin/etcd/lookup_test.go

@@ -3,6 +3,7 @@
 package etcd
 
 import (
+	"context"
 	"encoding/json"
 	"testing"
 	"time"
@@ -14,8 +15,6 @@ import (
 	"github.com/coredns/coredns/plugin/proxy"
 	"github.com/coredns/coredns/plugin/test"
 
-	"context"
-
 	etcdc "github.com/coreos/etcd/client"
 	"github.com/miekg/dns"
 )

plugin/etcd/setup.go

@@ -1,6 +1,7 @@
 package etcd
 
 import (
+	"context"
 	"crypto/tls"
 
 	"github.com/coredns/coredns/core/dnsserver"
@@ -9,8 +10,6 @@ import (
 	"github.com/coredns/coredns/plugin/pkg/upstream"
 	"github.com/coredns/coredns/plugin/proxy"
 
-	"context"
-
 	etcdc "github.com/coreos/etcd/client"
 	"github.com/mholt/caddy"
 )

plugin/etcd/stub_handler.go

@@ -1,13 +1,12 @@
 package etcd
 
 import (
+	"context"
 	"errors"
 
 	"github.com/coredns/coredns/plugin/pkg/log"
 	"github.com/coredns/coredns/request"
 
-	"context"
-
 	"github.com/miekg/dns"
 )
 

plugin/etcd/xfr.go

@@ -1,11 +1,11 @@
 package etcd
 
 import (
+	"context"
 	"time"
 
-	"context"
-
 	"github.com/coredns/coredns/request"
+
 	"github.com/miekg/dns"
 )