[WIP][DO_NOT_MERGE] add an upstream image field to builds

we are expecting multiple (possibly).  in the case of a custom build, you might have a trigger for both the custombuild image, and a upstream image.  In this case, even though only one trigger fired, we need to look up the actual image id for both images.