AMENDED AND RESTATED SEVERANCE AND CHANGE-IN-CONTROL AGREEMENT