c18036 Import from github.com/openshift/oc

Merged and Committed by lorbus 2 years ago