Merged fversion -> copyfs-fversion. Decrufted old 1.0 files.