bug 968381 - diamond config ensures diamond package installation first. r=dustin