Goldman, Blackstone Make Peace in Credit-Derivative Standoff