Merge "don't block uninstall of unknown packages" into oc-dev