[master/f20 0/3] v3 of the preconf/baserepo fixes.