AMENDED AND RESTATED AGREEMENT OF LIMITED PARTNERSHIP OF CORPORATE PROPERTY ASSOCIATES 6 (A CALIFORNIA LIMITED PARTNERSHIP)