AMENDMENT NO. 2 TO CREDIT AGREEMENT AND WAIVER