We now have baseimage in its own repository.  We also
bake a lot more of the image in during baseimage
creation, so we can relax some of the logic here.

Fixes FAB-284

Change-Id: I489004800635a126cff78dab79134fac9ae24722
Signed-off-by: Gregory Haskins <gregory.haskins@gmail.com>