@@ -19,6 +19,7 @@ import (

 	"k8s.io/kubernetes/pkg/kubectl/resource"

 	kruntime "k8s.io/kubernetes/pkg/runtime"

 	"k8s.io/kubernetes/pkg/util"

+	kflag "k8s.io/kubernetes/pkg/util/flag"

 	"github.com/openshift/origin/pkg/api/latest"

 	templateapi "github.com/openshift/origin/pkg/template/api"

@@ -73,7 +74,7 @@ func changeObjectsVersion(items []kruntime.Object) {

 func main() {

 	runtime.GOMAXPROCS(runtime.NumCPU())

-	flag.CommandLine.SetNormalizeFunc(util.WordSepNormalizeFunc)

+	flag.CommandLine.SetNormalizeFunc(kflag.WordSepNormalizeFunc)

 	flag.Parse()

 	if *rewrite != "" {

@@ -30,7 +30,7 @@ func Convert_runtime_Object_To_runtime_RawExtension(in runtime.Object, out *runt

 		return err

 	}

-	out.RawJSON = bytes

+	out.Raw = bytes

 	out.Object = externalObject

 	return nil

@@ -40,7 +40,7 @@ func Convert_runtime_Object_To_runtime_RawExtension(in runtime.Object, out *runt

 // The caller doesn't know the type ahead of time and that means this method can't communicate the return value.  This sucks really badly.

 // I'm going to set the `in.Object` field can have callers to this function do magic to pull it back out.  I'm also going to bitch about it.

 func Convert_runtime_RawExtension_To_runtime_Object(in *runtime.RawExtension, out runtime.Object, s conversion.Scope) error {

-	if in == nil || len(in.RawJSON) == 0 || in.Object != nil {

+	if in == nil || len(in.Raw) == 0 || in.Object != nil {

 		return nil

 	}

@@ -50,7 +50,7 @@ func Convert_runtime_RawExtension_To_runtime_Object(in *runtime.RawExtension, ou

 	if err != nil {

 		return err

 	}

-	decodedObject, err := runtime.Decode(kapi.Codecs.UniversalDecoder(srcVersion), in.RawJSON)

+	decodedObject, err := runtime.Decode(kapi.Codecs.UniversalDecoder(srcVersion), in.Raw)

 	if err != nil {

 		return err

 	}

@@ -129,7 +129,7 @@ func BuildGraph(path string) (osgraph.Graph, []runtime.Object, error) {

 	})

 	r := resource.NewBuilder(mapper, typer, clientMapper, kapi.Codecs.UniversalDecoder()).

-		FilenameParam(false, abspath).

+		FilenameParam(false, false, abspath).

 		Flatten().

 		Do()

@@ -16,7 +16,7 @@ import (

 	"k8s.io/kubernetes/pkg/api/validation"

 	"k8s.io/kubernetes/pkg/runtime"

 	"k8s.io/kubernetes/pkg/types"

-	"k8s.io/kubernetes/pkg/util"

+	"k8s.io/kubernetes/pkg/util/diff"

 	"k8s.io/kubernetes/pkg/util/intstr"

 	"k8s.io/kubernetes/pkg/util/sets"

@@ -452,7 +452,7 @@ func roundTrip(t *testing.T, codec runtime.Codec, originalItem runtime.Object) {

 	}

 	if !kapi.Semantic.DeepEqual(originalItem, obj2) {

-		t.Errorf("1: %v: diff: %v\nCodec: %v\nData: %s\nSource: %s", name, util.ObjectDiff(originalItem, obj2), codec, string(data), util.ObjectGoPrintSideBySide(originalItem, obj2))

+		t.Errorf("1: %v: diff: %v\nCodec: %v\nData: %s\nSource: %s", name, diff.ObjectDiff(originalItem, obj2), codec, string(data), diff.ObjectGoPrintSideBySide(originalItem, obj2))

 		return

 	}

@@ -462,7 +462,7 @@ func roundTrip(t *testing.T, codec runtime.Codec, originalItem runtime.Object) {

 		return

 	}

 	if !kapi.Semantic.DeepEqual(originalItem, obj3) {

-		t.Errorf("3: %v: diff: %v\nCodec: %v", name, util.ObjectDiff(originalItem, obj3), codec)

+		t.Errorf("3: %v: diff: %v\nCodec: %v", name, diff.ObjectDiff(originalItem, obj3), codec)

 		return

 	}

 }

@@ -5,7 +5,7 @@ import (

 	"fmt"

 	"net"

-	"k8s.io/kubernetes/pkg/util"

+	"k8s.io/kubernetes/pkg/util/crypto"

 	"github.com/openshift/origin/pkg/auth/ldaputil/ldapclient"

 	"gopkg.in/ldap.v2"

@@ -20,7 +20,7 @@ func NewLDAPClientConfig(URL, bindDN, bindPassword, CA string, insecure bool) (l

 	tlsConfig := &tls.Config{}

 	if len(CA) > 0 {

-		roots, err := util.CertPoolFromFile(CA)

+		roots, err := crypto.CertPoolFromFile(CA)

 		if err != nil {

 			return nil, fmt.Errorf("error loading cert pool from ca file %s: %v", CA, err)

 		}

@@ -6,7 +6,7 @@ import (

 	"testing"

 	kapi "k8s.io/kubernetes/pkg/api"

-	"k8s.io/kubernetes/pkg/util"

+	"k8s.io/kubernetes/pkg/util/diff"

 	"k8s.io/kubernetes/pkg/util/sets"

 	authorizationapi "github.com/openshift/origin/pkg/authorization/api"

@@ -152,7 +152,7 @@ func (r *resourceAccessTest) runTest(t *testing.T) {

 	switch obj.(type) {

 	case *authorizationapi.ResourceAccessReviewResponse:

 		if !reflect.DeepEqual(expectedResponse, obj) {

-			t.Errorf("diff %v", util.ObjectGoPrintDiff(expectedResponse, obj))

+			t.Errorf("diff %v", diff.ObjectGoPrintDiff(expectedResponse, obj))

 		}

 	case nil:

 		if len(r.authorizer.err) == 0 {

@@ -163,6 +163,6 @@ func (r *resourceAccessTest) runTest(t *testing.T) {

 	}

 	if !reflect.DeepEqual(expectedAttributes, r.authorizer.actualAttributes) {

-		t.Errorf("diff %v", util.ObjectGoPrintDiff(expectedAttributes, r.authorizer.actualAttributes))

+		t.Errorf("diff %v", diff.ObjectGoPrintDiff(expectedAttributes, r.authorizer.actualAttributes))

 	}

 }

@@ -6,7 +6,7 @@ import (

 	"testing"

 	kapi "k8s.io/kubernetes/pkg/api"

-	"k8s.io/kubernetes/pkg/util"

+	"k8s.io/kubernetes/pkg/util/diff"

 	"k8s.io/kubernetes/pkg/util/sets"

 	authorizationapi "github.com/openshift/origin/pkg/authorization/api"

@@ -182,7 +182,7 @@ func (r *subjectAccessTest) runTest(t *testing.T) {

 	switch obj.(type) {

 	case *authorizationapi.SubjectAccessReviewResponse:

 		if !reflect.DeepEqual(expectedResponse, obj) {

-			t.Errorf("diff %v", util.ObjectGoPrintDiff(expectedResponse, obj))

+			t.Errorf("diff %v", diff.ObjectGoPrintDiff(expectedResponse, obj))

 		}

 	case nil:

 		if len(r.authorizer.err) == 0 {

@@ -194,6 +194,6 @@ func (r *subjectAccessTest) runTest(t *testing.T) {

 	}

 	if !reflect.DeepEqual(expectedAttributes, r.authorizer.actualAttributes) {

-		t.Errorf("diff %v", util.ObjectGoPrintDiff(expectedAttributes, r.authorizer.actualAttributes))

+		t.Errorf("diff %v", diff.ObjectGoPrintDiff(expectedAttributes, r.authorizer.actualAttributes))

 	}

 }

@@ -6,7 +6,7 @@ import (

 	"testing"

 	kapi "k8s.io/kubernetes/pkg/api"

-	"k8s.io/kubernetes/pkg/util"

+	"k8s.io/kubernetes/pkg/util/diff"

 	"k8s.io/kubernetes/pkg/util/sets"

 	authorizationapi "github.com/openshift/origin/pkg/authorization/api"

@@ -136,7 +136,7 @@ func (r *resourceAccessTest) runTest(t *testing.T) {

 	switch obj.(type) {

 	case *authorizationapi.ResourceAccessReviewResponse:

 		if !reflect.DeepEqual(expectedResponse, obj) {

-			t.Errorf("diff %v", util.ObjectGoPrintDiff(expectedResponse, obj))

+			t.Errorf("diff %v", diff.ObjectGoPrintDiff(expectedResponse, obj))

 		}

 	case nil:

 		if len(r.authorizer.err) == 0 {

@@ -147,6 +147,6 @@ func (r *resourceAccessTest) runTest(t *testing.T) {

 	}

 	if !reflect.DeepEqual(expectedAttributes, r.authorizer.actualAttributes) {

-		t.Errorf("diff %v", util.ObjectGoPrintDiff(expectedAttributes, r.authorizer.actualAttributes))

+		t.Errorf("diff %v", diff.ObjectGoPrintDiff(expectedAttributes, r.authorizer.actualAttributes))

 	}

 }

@@ -6,7 +6,7 @@ import (

 	"testing"

 	kapi "k8s.io/kubernetes/pkg/api"

-	"k8s.io/kubernetes/pkg/util"

+	"k8s.io/kubernetes/pkg/util/diff"

 	"k8s.io/kubernetes/pkg/util/sets"

 	authorizationapi "github.com/openshift/origin/pkg/authorization/api"

@@ -159,7 +159,7 @@ func (r *subjectAccessTest) runTest(t *testing.T) {

 	switch obj.(type) {

 	case *authorizationapi.SubjectAccessReviewResponse:

 		if !reflect.DeepEqual(expectedResponse, obj) {

-			t.Errorf("diff %v", util.ObjectGoPrintDiff(expectedResponse, obj))

+			t.Errorf("diff %v", diff.ObjectGoPrintDiff(expectedResponse, obj))

 		}

 	case nil:

 		if len(r.authorizer.err) == 0 {

@@ -171,6 +171,6 @@ func (r *subjectAccessTest) runTest(t *testing.T) {

 	}

 	if !reflect.DeepEqual(expectedAttributes, r.authorizer.actualAttributes) {

-		t.Errorf("diff %v", util.ObjectGoPrintDiff(expectedAttributes, r.authorizer.actualAttributes))

+		t.Errorf("diff %v", diff.ObjectGoPrintDiff(expectedAttributes, r.authorizer.actualAttributes))

 	}

 }

@@ -13,7 +13,7 @@ import (

 	kclient "k8s.io/kubernetes/pkg/client/unversioned"

 	"k8s.io/kubernetes/pkg/labels"

 	"k8s.io/kubernetes/pkg/runtime"

-	kutil "k8s.io/kubernetes/pkg/util"

+	"k8s.io/kubernetes/pkg/util/flowcontrol"

 	utilruntime "k8s.io/kubernetes/pkg/util/runtime"

 	"k8s.io/kubernetes/pkg/watch"

@@ -95,7 +95,7 @@ func (factory *BuildControllerFactory) Create() controller.RunnableController {

 			queue,

 			cache.MetaNamespaceKeyFunc,

 			limitedLogAndRetry(factory.BuildUpdater, 30*time.Minute),

-			kutil.NewTokenBucketRateLimiter(1, 10)),

+			flowcontrol.NewTokenBucketRateLimiter(1, 10)),

 		Handle: func(obj interface{}) error {

 			build := obj.(*buildapi.Build)

 			err := buildController.HandleBuild(build)

@@ -134,7 +134,7 @@ func (factory *BuildControllerFactory) CreateDeleteController() controller.Runna

 			queue,

 			cache.MetaNamespaceKeyFunc,

 			controller.RetryNever,

-			kutil.NewTokenBucketRateLimiter(1, 10)),

+			flowcontrol.NewTokenBucketRateLimiter(1, 10)),

 		Handle: func(obj interface{}) error {

 			deltas := obj.(cache.Deltas)

 			for _, delta := range deltas {

@@ -201,7 +201,7 @@ func (factory *BuildPodControllerFactory) Create() controller.RunnableController

 			queue,

 			cache.MetaNamespaceKeyFunc,

 			retryFunc("BuildPod", nil),

-			kutil.NewTokenBucketRateLimiter(1, 10)),

+			flowcontrol.NewTokenBucketRateLimiter(1, 10)),

 		Handle: func(obj interface{}) error {

 			pod := obj.(*kapi.Pod)

 			return buildPodController.HandlePod(pod)

@@ -250,7 +250,7 @@ func (factory *BuildPodControllerFactory) CreateDeleteController() controller.Ru

 			queue,

 			cache.MetaNamespaceKeyFunc,

 			controller.RetryNever,

-			kutil.NewTokenBucketRateLimiter(1, 10)),

+			flowcontrol.NewTokenBucketRateLimiter(1, 10)),

 		Handle: func(obj interface{}) error {

 			deltas := obj.(cache.Deltas)

 			for _, delta := range deltas {

@@ -295,7 +295,7 @@ func (factory *ImageChangeControllerFactory) Create() controller.RunnableControl

 				_, isFatal := err.(buildcontroller.ImageChangeControllerFatalError)

 				return isFatal

 			}),

-			kutil.NewTokenBucketRateLimiter(1, 10),

+			flowcontrol.NewTokenBucketRateLimiter(1, 10),

 		),

 		Handle: func(obj interface{}) error {

 			imageRepo := obj.(*imageapi.ImageStream)

@@ -326,7 +326,7 @@ func (factory *BuildConfigControllerFactory) Create() controller.RunnableControl

 			queue,

 			cache.MetaNamespaceKeyFunc,

 			retryFunc("BuildConfig", buildcontroller.IsFatal),

-			kutil.NewTokenBucketRateLimiter(1, 10)),

+			flowcontrol.NewTokenBucketRateLimiter(1, 10)),

 		Handle: func(obj interface{}) error {

 			bc := obj.(*buildapi.BuildConfig)

 			return bcController.HandleBuildConfig(bc)

@@ -5,7 +5,7 @@ import (

 	"k8s.io/kubernetes/pkg/api/errors"

 	"k8s.io/kubernetes/pkg/apis/extensions"

-	unversioned_extensions "k8s.io/kubernetes/pkg/client/typed/generated/extensions/unversioned"

+	unversioned_extensions "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned"

 	kclient "k8s.io/kubernetes/pkg/client/unversioned"

 	"github.com/openshift/origin/pkg/api/latest"

@@ -408,7 +408,8 @@ func (o *SyncOptions) Run(cmd *cobra.Command, f *clientcmd.Factory) error {

 	for _, item := range openshiftGroups {

 		list.Items = append(list.Items, item)

 	}

-	fn := cmdutil.VersionedPrintObject(f.PrintObject, cmd, o.Out)

+	mapper, _ := f.Object(false)

+	fn := cmdutil.VersionedPrintObject(f.PrintObject, cmd, mapper, o.Out)

 	if err := fn(list); err != nil {

 		return err

 	}

@@ -57,7 +57,7 @@ func (n *NodeOptions) Complete(f *clientcmd.Factory, c *cobra.Command, args []st

 	if err != nil {

 		return err

 	}

-	mapper, typer := f.Object()

+	mapper, typer := f.Object(false)

 	n.DefaultNamespace = defaultNamespace

 	n.Kclient = kc

@@ -117,7 +117,7 @@ func (o *ReconcileClusterRoleBindingsOptions) Complete(cmd *cobra.Command, f *cl

 	o.ExcludeSubjects = authorizationapi.BuildSubjects(excludeUsers, excludeGroups, uservalidation.ValidateUserName, uservalidation.ValidateGroupName)

-	mapper, _ := f.Object()

+	mapper, _ := f.Object(false)

 	for _, resourceString := range args {

 		resource, name, err := cmdutil.ResolveResource(authorizationapi.Resource("clusterroles"), resourceString, mapper)

 		if err != nil {

@@ -162,7 +162,8 @@ func (o *ReconcileClusterRoleBindingsOptions) RunReconcileClusterRoleBindings(cm

 		for _, item := range changedClusterRoleBindings {

 			list.Items = append(list.Items, item)

 		}

-		fn := cmdutil.VersionedPrintObject(f.PrintObject, cmd, o.Out)

+		mapper, _ := f.Object(false)

+		fn := cmdutil.VersionedPrintObject(f.PrintObject, cmd, mapper, o.Out)

 		if err := fn(list); err != nil {

 			return err

 		}

@@ -100,7 +100,7 @@ func (o *ReconcileClusterRolesOptions) Complete(cmd *cobra.Command, f *clientcmd

 	o.Output = kcmdutil.GetFlagString(cmd, "output")

-	mapper, _ := f.Object()

+	mapper, _ := f.Object(false)

 	for _, resourceString := range args {

 		resource, name, err := osutil.ResolveResource(authorizationapi.Resource("clusterroles"), resourceString, mapper)

 		if err != nil {

@@ -145,7 +145,8 @@ func (o *ReconcileClusterRolesOptions) RunReconcileClusterRoles(cmd *cobra.Comma

 		for _, item := range changedClusterRoles {

 			list.Items = append(list.Items, item)

 		}

-		fn := cmdutil.VersionedPrintObject(f.PrintObject, cmd, o.Out)

+		mapper, _ := f.Object(false)

+		fn := cmdutil.VersionedPrintObject(f.PrintObject, cmd, mapper, o.Out)

 		if err := fn(list); err != nil {

 			return err

 		}

@@ -151,7 +151,8 @@ func (o *ReconcileSCCOptions) RunReconcileSCCs(cmd *cobra.Command, f *clientcmd.

 		for _, item := range changedSCCs {

 			list.Items = append(list.Items, item)

 		}

-		fn := cmdutil.VersionedPrintObject(f.PrintObject, cmd, o.Out)

+		mapper, _ := f.Object(false)

+		fn := cmdutil.VersionedPrintObject(f.PrintObject, cmd, mapper, o.Out)

 		if err := fn(list); err != nil {

 			return err

 		}

@@ -64,7 +64,7 @@ func (o *whoCanOptions) complete(f *clientcmd.Factory, args []string) error {

 		return errors.New("you must specify two arguments: verb and resource")

 	}

-	restMapper, _ := f.Object()

+	restMapper, _ := f.Object(false)

 	o.verb = args[0]

 	o.resource = resourceFor(restMapper, args[1])

@@ -405,14 +405,15 @@ func RunCmdRegistry(f *clientcmd.Factory, cmd *cobra.Command, out io.Writer, cfg

 	list := &kapi.List{Items: objects}

 	if output {

-		fn := cmdutil.VersionedPrintObject(f.PrintObject, cmd, out)

+		mapper, _ := f.Object(false)

+		fn := cmdutil.VersionedPrintObject(f.PrintObject, cmd, mapper, out)

 		if err := fn(list); err != nil {

 			return fmt.Errorf("unable to print object: %v", err)

 		}

 		return nil

 	}

-	mapper, typer := f.Factory.Object()

+	mapper, typer := f.Factory.Object(false)

 	bulk := configcmd.Bulk{

 		Mapper:            mapper,

 		Typer:             typer,

@@ -748,14 +748,15 @@ func RunCmdRouter(f *clientcmd.Factory, cmd *cobra.Command, out io.Writer, cfg *

 	list := &kapi.List{Items: objects}

 	if output {

-		fn := cmdutil.VersionedPrintObject(f.PrintObject, cmd, out)

+		mapper, _ := f.Object(false)

+		fn := cmdutil.VersionedPrintObject(f.PrintObject, cmd, mapper, out)

 		if err := fn(list); err != nil {

 			return fmt.Errorf("unable to print object: %v", err)

 		}

 		return defaultOutputErr

 	}

-	mapper, typer := f.Factory.Object()

+	mapper, typer := f.Factory.Object(false)

 	bulk := configcmd.Bulk{

 		Mapper:            mapper,

 		Typer:             typer,

@@ -70,7 +70,7 @@ func RunCancelBuild(f *clientcmd.Factory, out io.Writer, cmd *cobra.Command, arg

 	}

 	buildClient := client.Builds(namespace)

-	mapper, typer := f.Object()

+	mapper, typer := f.Object(false)

 	obj, err := resource.NewBuilder(mapper, typer, resource.ClientMapperFunc(f.ClientForMapping), kapi.Codecs.UniversalDecoder()).

 		NamespaceParam(namespace).

 		ResourceNames("builds", buildName).

@@ -117,7 +117,7 @@ func RunCancelBuild(f *clientcmd.Factory, out io.Writer, cmd *cobra.Command, arg

 	}

 	fmt.Fprintf(out, "Build %s was cancelled.\n", build.Name)

-	// mapper, typer := f.Object()

+	// mapper, typer := f.Object(false)

 	// resourceMapper := &resource.Mapper{ObjectTyper: typer, RESTMapper: mapper, ClientMapper: f.ClientMapperForCommand()}

 	// shortOutput := kcmdutil.GetFlagString(cmd, "output") == "name"

@@ -137,7 +137,7 @@ func CreateEdgeRoute(f *clientcmd.Factory, out io.Writer, cmd *cobra.Command, ar

 	if err != nil {

 		return err

 	}

-	mapper, typer := f.Object()

+	mapper, typer := f.Object(false)

 	resourceMapper := &resource.Mapper{

 		ObjectTyper:  typer,

 		RESTMapper:   mapper,

@@ -222,7 +222,7 @@ func CreatePassthroughRoute(f *clientcmd.Factory, out io.Writer, cmd *cobra.Comm

 	if err != nil {

 		return err

 	}

-	mapper, typer := f.Object()

+	mapper, typer := f.Object(false)

 	resourceMapper := &resource.Mapper{

 		ObjectTyper:  typer,

 		RESTMapper:   mapper,

@@ -340,7 +340,7 @@ func CreateReencryptRoute(f *clientcmd.Factory, out io.Writer, cmd *cobra.Comman

 	if err != nil {

 		return err

 	}

-	mapper, typer := f.Object()

+	mapper, typer := f.Object(false)

 	resourceMapper := &resource.Mapper{

 		ObjectTyper:  typer,

 		RESTMapper:   mapper,

@@ -415,7 +415,7 @@ func resolveServiceName(f *clientcmd.Factory, resource string) (string, error) {

 	if len(resource) == 0 {

 		return "", fmt.Errorf("you need to provide a service name via --service")

 	}

-	mapper, _ := f.Object()

+	mapper, _ := f.Object(false)

 	rType, name, err := cmdutil.ResolveResource(kapi.Resource("services"), resource, mapper)

 	if err != nil {

 		return "", err

@@ -192,7 +192,7 @@ func (o *DebugOptions) Complete(cmd *cobra.Command, f *clientcmd.Factory, args [

 		return err

 	}

-	mapper, typer := f.Object()

+	mapper, typer := f.Object(false)

 	b := resource.NewBuilder(mapper, typer, resource.ClientMapperFunc(f.ClientForMapping), kapi.Codecs.UniversalDecoder()).

 		NamespaceParam(cmdNamespace).DefaultNamespace().

 		SingleResourceType().

@@ -238,7 +238,7 @@ func (o *DebugOptions) Complete(cmd *cobra.Command, f *clientcmd.Factory, args [

 	output := kcmdutil.GetFlagString(cmd, "output")

 	if len(output) != 0 {

 		o.Print = func(pod *kapi.Pod, out io.Writer) error {

-			return f.PrintObject(cmd, pod, out)

+			return f.PrintObject(cmd, mapper, pod, out)

 		}

 	}

@@ -136,7 +136,7 @@ func (o *DeployOptions) Complete(f *clientcmd.Factory, args []string, out io.Wri

 		return err

 	}

-	mapper, typer := f.Object()

+	mapper, typer := f.Object(false)

 	o.builder = resource.NewBuilder(mapper, typer, resource.ClientMapperFunc(f.ClientForMapping), kapi.Codecs.UniversalDecoder())

 	o.out = out

@@ -103,7 +103,7 @@ func RunExport(f *clientcmd.Factory, exporter Exporter, in io.Reader, out io.Wri

 		return err

 	}

-	mapper, typer := f.Object()

+	mapper, typer := f.Object(false)

 	b := resource.NewBuilder(mapper, typer, resource.ClientMapperFunc(f.ClientForMapping), kapi.Codecs.UniversalDecoder()).

 		NamespaceParam(cmdNamespace).DefaultNamespace().AllNamespaces(allNamespaces).

 		FilenameParam(explicit, filenames...).

@@ -78,7 +78,7 @@ func validate(cmd *cobra.Command, f *clientcmd.Factory, args []string) error {

 		return err

 	}

-	mapper, typer := f.Object()

+	mapper, typer := f.Object(false)

 	r := resource.NewBuilder(mapper, typer, resource.ClientMapperFunc(f.ClientForMapping), kapi.Codecs.UniversalDecoder()).

 		ContinueOnError().

 		NamespaceParam(namespace).DefaultNamespace().

@@ -98,7 +98,7 @@ func (o *OpenShiftLogsOptions) Complete(f *clientcmd.Factory, out io.Writer, cmd

 	podLogOptions := o.KubeLogOptions.Options.(*kapi.PodLogOptions)

-	mapper, typer := f.Object()

+	mapper, typer := f.Object(false)

 	infos, err := resource.NewBuilder(mapper, typer, resource.ClientMapperFunc(f.ClientForMapping), kapi.Codecs.UniversalDecoder()).

 		NamespaceParam(namespace).DefaultNamespace().

 		ResourceNames("pods", args...).

@@ -205,7 +205,8 @@ func (o *NewAppOptions) Complete(commandName string, f *clientcmd.Factory, c *co

 	o.CommandPath = c.CommandPath()

 	o.CommandName = commandName

-	o.PrintObject = cmdutil.VersionedPrintObject(f.PrintObject, c, out)

+	mapper, _ := f.Object(false)

+	o.PrintObject = cmdutil.VersionedPrintObject(f.PrintObject, c, mapper, out)

 	o.LogsForObject = f.LogsForObject

 	if err := CompleteAppConfig(o.Config, f, c, args); err != nil {

 		return err

@@ -462,7 +463,7 @@ func getDockerClient() (*docker.Client, error) {

 }

 func CompleteAppConfig(config *newcmd.AppConfig, f *clientcmd.Factory, c *cobra.Command, args []string) error {

-	mapper, typer := f.Object()

+	mapper, typer := f.Object(false)

 	if config.Mapper == nil {

 		config.Mapper = mapper

 	}

@@ -156,7 +156,8 @@ func (o *NewBuildOptions) Complete(fullName string, f *clientcmd.Factory, c *cob

 	o.CommandPath = c.CommandPath()

 	o.CommandName = fullName

-	o.PrintObject = cmdutil.VersionedPrintObject(f.PrintObject, c, out)

+	mapper, _ := f.Object(false)

+	o.PrintObject = cmdutil.VersionedPrintObject(f.PrintObject, c, mapper, out)

 	o.LogsForObject = f.LogsForObject

 	if err := CompleteAppConfig(o.Config, f, c, args); err != nil {

 		return err

@@ -114,7 +114,7 @@ func RunProcess(f *clientcmd.Factory, out io.Writer, cmd *cobra.Command, args []

 		return err

 	}

-	mapper, typer := f.Object()

+	mapper, typer := f.Object(false)

 	client, _, err := f.Clients()

 	if err != nil {

@@ -130,7 +130,7 @@ func (o *RollbackOptions) Complete(f *clientcmd.Factory, args []string, out io.W

 	o.Namespace = namespace

 	// Set up client based support.

-	mapper, typer := f.Object()

+	mapper, typer := f.Object(false)

 	o.getBuilder = func() *resource.Builder {

 		return resource.NewBuilder(mapper, typer, resource.ClientMapperFunc(f.ClientForMapping), kapi.Codecs.UniversalDecoder())

 	}

@@ -139,7 +139,7 @@ func RunEnv(f *clientcmd.Factory, in io.Reader, out io.Writer, cmd *cobra.Comman

 		return err

 	}

-	mapper, typer := f.Object()

+	mapper, typer := f.Object(false)

 	b := resource.NewBuilder(mapper, typer, resource.ClientMapperFunc(f.ClientForMapping), kapi.Codecs.UniversalDecoder()).

 		ContinueOnError().

 		NamespaceParam(cmdNamespace).DefaultNamespace().

@@ -170,7 +170,7 @@ func (o *ProbeOptions) Complete(f *clientcmd.Factory, cmd *cobra.Command, args [

 		return err

 	}

-	mapper, typer := f.Object()

+	mapper, typer := f.Object(false)

 	o.Builder = resource.NewBuilder(mapper, typer, resource.ClientMapperFunc(f.ClientForMapping), kapi.Codecs.UniversalDecoder()).

 		ContinueOnError().

 		NamespaceParam(cmdNamespace).DefaultNamespace().

@@ -181,7 +181,7 @@ func (o *ProbeOptions) Complete(f *clientcmd.Factory, cmd *cobra.Command, args [

 	output := kcmdutil.GetFlagString(cmd, "output")

 	if len(output) != 0 {

-		o.PrintObject = func(obj runtime.Object) error { return f.PrintObject(cmd, obj, o.Out) }

+		o.PrintObject = func(obj runtime.Object) error { return f.PrintObject(cmd, mapper, obj, o.Out) }

 	}

 	o.Encoder = f.JSONEncoder()

@@ -181,7 +181,7 @@ func (o *TriggersOptions) Complete(f *clientcmd.Factory, cmd *cobra.Command, arg

 		o.Auto = true

 	}

-	mapper, typer := f.Object()

+	mapper, typer := f.Object(false)

 	o.Builder = resource.NewBuilder(mapper, typer, resource.ClientMapperFunc(f.ClientForMapping), kapi.Codecs.UniversalDecoder()).

 		ContinueOnError().

 		NamespaceParam(cmdNamespace).DefaultNamespace().

@@ -192,7 +192,7 @@ func (o *TriggersOptions) Complete(f *clientcmd.Factory, cmd *cobra.Command, arg

 	output := kcmdutil.GetFlagString(cmd, "output")

 	if len(output) != 0 {

-		o.PrintObject = func(obj runtime.Object) error { return f.PrintObject(cmd, obj, o.Out) }

+		o.PrintObject = func(obj runtime.Object) error { return f.PrintObject(cmd, mapper, obj, o.Out) }

 	}

 	o.Encoder = f.JSONEncoder()

@@ -315,7 +315,7 @@ func (v *VolumeOptions) Complete(f *clientcmd.Factory, cmd *cobra.Command, out,

 	if err != nil {

 		return err

 	}

-	mapper, typer := f.Object()

+	mapper, typer := f.Object(false)

 	v.DefaultNamespace = cmdNamespace

 	v.ExplicitNamespace = explicit

@@ -184,7 +184,7 @@ func (o *StartBuildOptions) Complete(f *clientcmd.Factory, in io.Reader, out io.

 	)

 	if len(name) == 0 && len(args) > 0 && len(args[0]) > 0 {

-		mapper, _ := f.Object()

+		mapper, _ := f.Object(false)

 		resource, name, err = cmdutil.ResolveResource(buildapi.Resource("buildconfigs"), args[0], mapper)

 		if err != nil {

 			return err

@@ -116,7 +116,7 @@ func parseStreamName(defaultNamespace, name string) (string, string, error) {

 }

 func determineSourceKind(f *clientcmd.Factory, input string) string {

-	mapper, _ := f.Object()

+	mapper, _ := f.Object(false)

 	gvks, err := mapper.KindsFor(unversioned.GroupVersionResource{Group: imageapi.GroupName, Resource: input})

 	if err == nil {

 		return gvks[0].Kind

@@ -119,7 +119,7 @@ func (o *AddSecretOptions) Complete(f *kcmdutil.Factory, args []string, typeFlag

 		return err

 	}

-	o.Mapper, o.Typer = f.Object()

+	o.Mapper, o.Typer = f.Object(false)

 	o.ClientMapper = resource.ClientMapperFunc(f.ClientForMapping)

 	return nil

@@ -80,7 +80,8 @@ func NewCmdCreateBasicAuthSecret(name, fullName string, f *kcmdutil.Factory, rea

 				secret, err := o.NewBasicAuthSecret()

 				kcmdutil.CheckErr(err)

-				kcmdutil.CheckErr(f.PrintObject(c, secret, out))

+				mapper, _ := f.Object(false)

+				kcmdutil.CheckErr(f.PrintObject(c, mapper, secret, out))

 				return

 			}

@@ -80,7 +80,8 @@ func NewCmdCreateDockerConfigSecret(name, fullName string, f *kcmdutil.Factory,

 				secret, err := o.NewDockerSecret()

 				kcmdutil.CheckErr(err)

-				kcmdutil.CheckErr(f.PrintObject(c, secret, out))

+				mapper, _ := f.Object(false)

+				kcmdutil.CheckErr(f.PrintObject(c, mapper, secret, out))

 				return

 			}

@@ -91,7 +91,8 @@ func NewCmdCreateSecret(name, fullName string, f *clientcmd.Factory, out io.Writ

 				secret, err := options.BundleSecret()

 				kcmdutil.CheckErr(err)

-				kcmdutil.CheckErr(f.Factory.PrintObject(c, secret, out))

+				mapper, _ := f.Object(false)

+				kcmdutil.CheckErr(f.Factory.PrintObject(c, mapper, secret, out))

 				return

 			}

@@ -74,7 +74,8 @@ func NewCmdCreateSSHAuthSecret(name, fullName string, f *kcmdutil.Factory, out i

 				secret, err := o.NewSSHAuthSecret()

 				kcmdutil.CheckErr(err)

-				kcmdutil.CheckErr(f.PrintObject(c, secret, out))

+				mapper, _ := f.Object(false)

+				kcmdutil.CheckErr(f.PrintObject(c, mapper, secret, out))

 				return

 			}

@@ -95,7 +95,7 @@ func (o *BuildChainOptions) Complete(f *clientcmd.Factory, cmd *cobra.Command, a

 	o.c, o.t = oc, oc

 	resource := unversioned.GroupResource{}

-	mapper, _ := f.Object()

+	mapper, _ := f.Object(false)

 	resource, o.name, err = osutil.ResolveResource(imageapi.Resource("imagestreamtags"), args[0], mapper)

 	if err != nil {

 		return err

@@ -35,7 +35,8 @@ func NewCommandCreateBootstrapProjectTemplate(f *clientcmd.Factory, commandName

 				cmdutil.CheckErr(err)

 			}

-			err = f.Factory.PrintObject(cmd, template, out)

+			mapper, _ := f.Object(false)

+			err = f.Factory.PrintObject(cmd, mapper, template, out)

 			if err != nil {

 				cmdutil.CheckErr(err)

 			}

@@ -11,7 +11,7 @@ import (

 	kapi "k8s.io/kubernetes/pkg/api"

 	kcmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"

-	"k8s.io/kubernetes/pkg/util"

+	"k8s.io/kubernetes/pkg/util/crypto"

 )

 const CreateClientCommandName = "create-api-client-config"

@@ -95,7 +95,7 @@ func (o CreateClientOptions) Validate(args []string) error {

 		return errors.New("certificate-authority must be provided")

 	} else {

 		for _, caFile := range o.APIServerCAFiles {

-			if _, err := util.CertPoolFromFile(caFile); err != nil {

+			if _, err := crypto.CertPoolFromFile(caFile); err != nil {

 				return fmt.Errorf("certificate-authority must be a valid certificate file: %v", err)

 			}

 		}

@@ -13,7 +13,7 @@ import (

 	kapi "k8s.io/kubernetes/pkg/api"

 	kcmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"

-	"k8s.io/kubernetes/pkg/util"

+	kcrypto "k8s.io/kubernetes/pkg/util/crypto"

 	cliconfig "github.com/openshift/origin/pkg/cmd/cli/config"

 	"github.com/openshift/origin/pkg/cmd/server/crypto"

@@ -121,7 +121,7 @@ func (o CreateKubeConfigOptions) Validate(args []string) error {

 		return errors.New("certificate-authority must be provided")

 	} else {

 		for _, caFile := range o.APIServerCAFiles {

-			if _, err := util.CertPoolFromFile(caFile); err != nil {

+			if _, err := kcrypto.CertPoolFromFile(caFile); err != nil {

 				return fmt.Errorf("certificate-authority must be a valid certificate file: %v", err)

 			}

 		}

@@ -14,7 +14,7 @@ import (

 	kapi "k8s.io/kubernetes/pkg/api"

 	kcmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"

-	"k8s.io/kubernetes/pkg/util"

+	"k8s.io/kubernetes/pkg/util/crypto"

 	utilerrors "k8s.io/kubernetes/pkg/util/errors"

 	"github.com/openshift/origin/pkg/util/parallel"

@@ -149,7 +149,7 @@ func (o CreateMasterCertsOptions) Validate(args []string) error {

 	}

 	for _, caFile := range o.APIServerCAFiles {

-		if _, err := util.CertPoolFromFile(caFile); err != nil {

+		if _, err := crypto.CertPoolFromFile(caFile); err != nil {

 			return fmt.Errorf("certificate authority must be a valid certificate file: %v", err)

 		}

 	}

@@ -18,7 +18,7 @@ import (

 	kcmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"

 	"k8s.io/kubernetes/pkg/master/ports"

 	"k8s.io/kubernetes/pkg/runtime"

-	"k8s.io/kubernetes/pkg/util"

+	"k8s.io/kubernetes/pkg/util/crypto"

 	"github.com/openshift/origin/pkg/cmd/flagtypes"

 	configapi "github.com/openshift/origin/pkg/cmd/server/api"

@@ -160,7 +160,7 @@ func (o CreateNodeConfigOptions) Validate(args []string) error {

 		return fmt.Errorf("--certificate-authority must be a valid certificate file")

 	} else {

 		for _, caFile := range o.APIServerCAFiles {

-			if _, err := util.CertPoolFromFile(caFile); err != nil {

+			if _, err := crypto.CertPoolFromFile(caFile); err != nil {

 				return fmt.Errorf("--certificate-authority must be a valid certificate file: %v", err)

 			}

 		}

@@ -14,7 +14,7 @@ import (

 	"k8s.io/kubernetes/pkg/runtime"

 	"k8s.io/kubernetes/pkg/runtime/serializer"

 	"k8s.io/kubernetes/pkg/types"

-	"k8s.io/kubernetes/pkg/util"

+	"k8s.io/kubernetes/pkg/util/diff"

 	configapi "github.com/openshift/origin/pkg/cmd/server/api"

 	configapiv1 "github.com/openshift/origin/pkg/cmd/server/api/v1"

@@ -236,7 +236,7 @@ func roundTrip(t *testing.T, codec runtime.Codec, originalItem runtime.Object) {

 	}

 	if !kapi.Semantic.DeepEqual(originalItem, obj2) {

-		t.Errorf("1: %v: diff: %v\nCodec: %v\nData: %s\nSource: %s", name, util.ObjectDiff(originalItem, obj2), codec, string(data), util.ObjectGoPrintSideBySide(originalItem, obj2))

+		t.Errorf("1: %v: diff: %v\nCodec: %v\nData: %s\nSource: %s", name, diff.ObjectDiff(originalItem, obj2), codec, string(data), diff.ObjectGoPrintSideBySide(originalItem, obj2))

 		return

 	}

@@ -246,7 +246,7 @@ func roundTrip(t *testing.T, codec runtime.Codec, originalItem runtime.Object) {

 		return

 	}

 	if !kapi.Semantic.DeepEqual(originalItem, obj3) {

-		t.Errorf("3: %v: diff: %v\nCodec: %v", name, util.ObjectDiff(originalItem, obj3), codec)

+		t.Errorf("3: %v: diff: %v\nCodec: %v", name, diff.ObjectDiff(originalItem, obj3), codec)

 		return

 	}

 }

@@ -310,7 +310,7 @@ func fuzzerFor(t *testing.T, version unversioned.GroupVersion, src rand.Source)

 		func(j *runtime.Object, c fuzz.Continue) {

 			*j = &runtime.Unknown{

 				// We do not set TypeMeta here because it is not carried through a round trip

-				RawJSON: []byte(`{"apiVersion":"unknown.group/unknown","kind":"Something","someKey":"someValue"}`),

+				Raw: []byte(`{"apiVersion":"unknown.group/unknown","kind":"Something","someKey":"someValue"}`),

 			}

 		},

 		func(j *unversioned.TypeMeta, c fuzz.Continue) {

@@ -339,14 +339,14 @@ func convert_runtime_Object_To_runtime_RawExtension(in runtime.Object, out *runt

 	if runtime.IsNotRegisteredError(err) {

 		switch cast := in.(type) {

 		case *runtime.Unknown:

-			out.RawJSON = cast.RawJSON

+			out.Raw = cast.Raw

 			return nil

 		case *runtime.Unstructured:

 			bytes, err := runtime.Encode(runtime.UnstructuredJSONScheme, externalObject)

 			if err != nil {

 				return err