Merge "Clean up ClassPathPackageInfoSource"