Squashed 'vendor/src/github.com/openshift/docker-source-to-images/' changes from cdf5c23..f94446d