AMENDED AND RESTATED CONTRIBUTION AGREEMENT (Future Membership Interests) BY AND BETWEEN The Oliver Carr Company a District of Columbia corporation, as Contributor AND Columbia Equity, LP, a Virginia limited partnership, as Acquirer