Bitter Solar Dispute Cools as Advocates, Duke Reach Deal to Allow More Rooftop Power