shixiong/okd @ 9199379f94f6b11a4841e31f6c58a11c1e9f8c3a

Jason DeTiberus 9199379f94 Various fixes		10 lat temu
..
openshift-cluster	9199379f94 Various fixes	10 lat temu
openshift-master	9199379f94 Various fixes	10 lat temu
openshift-node	9199379f94 Various fixes	10 lat temu