A last-minute agreement has defused a tense standoff over a renovation plan to convert a historic residential building in the Bayview into a headquarters for a local service nonprofit. Several ...