renaming and fix bug#958970
Merge pull request #2344 from rajatchopra/master

Merged by openshift-bot