AMENDED AND RESTATED MASTER TERMINALLING SERVICES AGREEMENT – SOUTHERN CALIFORNIA