minor fixes
Merge pull request #1933 from bdecoste/master

Merged by openshift-bot