AMENDED AND RESTATED MASTER RESELLER AGREEMENT