Backport some fixes to 9.2 for pkgng 1.2.x updating