fix parameter names and validation
Merge pull request #3383 from rajatchopra/master

Merged by openshift-bot