minor fixes
Merge pull request #2277 from danmcp/master

Merged by openshift-bot