Merge pull request #38252 from linyouchong/linyouchong-20161207

Automatic merge from submit-queue (batch tested with PRs 38252, 41122, 36101, 41017, 41264)

fix bug of runServer function in server.go

What this PR does / why we need it:
use parameter network instead of hardcode 'tcp' / the parameter network here is not equal to 'tcp'

**Special notes for your reviewer**:
NONE

**Release note**:
NONE

staging/src/k8s.io/apiserver/pkg/server/serve.go

@@ -149,7 +149,7 @@ func runServer(server *http.Server, network string, stopCh <-chan struct{}) (int
 				for {
 					time.Sleep(15 * time.Second)
 
-					ln, err = net.Listen("tcp", server.Addr)
+					ln, err = net.Listen(network, server.Addr)
 					if err == nil {
 						return
 					}