c18036 Import from github.com/openshift/oc

Merged and Committed by lorbus a year ago