PG&E Makes Peace With Bondholders, Strife With Gov. Newsom Continues