AMENDED AND RESTATED LIMITED PARTNERSHIP AGREEMENT OF MARRIOTT RESIDENCE INN II LIMITED PARTNERSHIP