Merge "Store "block uninstall" flag separately from the rest of package state." into oc-dev