Rather than risk litigation, both sides struck a deal that should lead to residential housing instead of warehousing.