Merge pull request #15862 from adityadani/portworx

Automatic merge from submit-queue (batch tested with PRs 15862, 15781, 15944)

Enable Portworx Storage Driver

This change
- Enables portworx storage driver through the kubernetes volume plugins API.
- Reverts commit - dcb5eef
- Removes the duplicate proto generation error.

Author: openshift-merge-robot

Godeps/Godeps.json

@@ -1,11 +1,10 @@
 package controller
 
 import (
+	"github.com/openshift/origin/pkg/cmd/server/bootstrappolicy"
 	"k8s.io/kubernetes/pkg/api/v1"
 	kapiv1 "k8s.io/kubernetes/pkg/api/v1"
 	"k8s.io/kubernetes/pkg/volume"
-
-	"github.com/openshift/origin/pkg/cmd/server/bootstrappolicy"
 )
 
 // newPersistentVolumeRecyclerPodTemplate provides a function which makes our recycler pod template for use in the kube-controller-manager