WAIVER AND AMENDMENT AGREEMENT NO. 2