Backport warden / pkgng fixes for 9.2