Merge "Handle renamed packages during default grants" into oc-dev