Mark pkg-check for later cleanup
Fix pkg bootstrapper being called when WITH_PKGNG not defined
3.16 Release