This splits up the kubernetes 1.19 PR to make it easier to keep up to date until we get it sorted out.
Also cleans some white spaces
We don't call klog.InitFlags yet, because that will cause a flag redefinition error until we get everyone to stop using glog. That will happen when we update to k8s 1.13.