More command consistency
Merge pull request #3856 from danmcp/master

Merged by openshift-bot