Merge "Resolve canonical package path before writing it to packages.list." into mnc-dev