AMENDED AND RESTATED GENERAL SEVERANCE AGREEMENT