Fixup 10.x pkg file with recent changes.