ROCHESTER — Apparently bringing to an end a contractual dispute with the city of Rochester over the use of The Castle, the former Armory building on North Broadway, a church that had occupied the ...