Merge "Change DELTA_FS type deltas to be created with relative pathnames and remove...