UNITED STATES HEATING OIL FUND, LP FORM OF AMENDED AND RESTATED AGREEMENT OF LIMITED PARTNERSHIP