Merge "Report normalized package name as default key" into oc-dev