Bug 923561 - Make help match usage
Bug 923559 - Make help match usage

* remove future options
Merge pull request #1729 from jwhonce/bug/923561

Merged by openshift-bot