Merge "Support new package file management scheme - lots of changes"