AMENDED AND RESTATED LIMITED PARTNERSHIP AGREEMENT OF SALOMON SMITH BARNEY AAA ENERGY FUND L.P. II