Backport fix to pkgng conflict checking
Backport pkg cleanup to 9.2