There are some clearly marked sections in build-cd that will fail if we end up having multiple targets. Fix these, and generify some of the comments that make reference to Gadi specifically.