U.S. government to drop tax claims against Trump in broadening of IRS settlement