Bug 983923 - Add "-h" as an argument to get help.
Bug 960355 - Fix file permissions.
Merge pull request #3127 from rmillner/misc_bugs

Merged by openshift-bot