Merge pull request #4899 from danmcp/master

Merged by openshift-bot
fix missing variable error
Merge pull request #4900 from rajatchopra/master

Merged by openshift-bot