Make dep handling consistent
Merge pull request #4964 from danmcp/master

Merged by openshift-bot