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

A rough in progress change.