INTRAWARE, INC. AMENDED AND RESTATED CHANGE OF CONTROL SEVERANCE AGREEMENT