[WIP] Add base image from the build UpstreamImage if set

A rough in progress change.
See comment here: https://github.com/openshift/origin/pull/557/files#r21797001