Fix some merge omissions for GPFS