GM to pay Whitacre $1.7 million base salary; Henderson to consult