Resolve conflicts in favor of the upstream side where possible. Resolve a logical conflict in archive_windows.h where the upstream port to Watcom was done slightly differently from ours.
Add Utilities/cmlibarchive using upstream libarchive 3.0.0-r3950 snapshot.