merge in Phys14 and CombineHarvester updates