Merge 'v1.5.2' into master

vendor/github.com/rancher/go-rancher-metadata/main.go

@@ -1,31 +0,0 @@
-package main
-
-import (
-	"time"
-
-	"github.com/sirupsen/logrus"
-	"github.com/rancher/go-rancher-metadata/metadata"
-)
-
-const (
-	metadataUrl = "http://rancher-metadata/2015-12-19"
-)
-
-func main() {
-	m := metadata.NewClient(metadataUrl)
-
-	version := "init"
-
-	for {
-		newVersion, err := m.GetVersion()
-		if err != nil {
-			logrus.Errorf("Error reading metadata version: %v", err)
-		} else if version == newVersion {
-			logrus.Debug("No changes in metadata version")
-		} else {
-			logrus.Debugf("Metadata version has changed, oldVersion=[%s], newVersion=[%s]", version, newVersion)
-			version = newVersion
-		}
-		time.Sleep(5 * time.Second)
-	}
-}

vendor/github.com/rancher/go-rancher/main.go

@@ -1,10 +0,0 @@
-package main
-
-import (
-	"fmt"
-	_ "github.com/rancher/go-rancher/client"
-)
-
-func main() {
-	fmt.Println("I have nothing to do...")
-}