Merge "Populate mPackages with system pkg even if installed is better" into pi-dev