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

A rough in progress change.
This doesn't belong here, but on individual strategies.  Not all strategies will have images.