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

A rough in progress change.
One more unrelated note for Ben - the image change triggers should probably be image name based - ie the trigger is on the docker pull spec "foo/bar:tag", so if you have two references to that we would replace both.  That solves the complexity of reference by structure by making it the responsibility of generic code