OMNIBUS AMENDMENT AGREEMENT AND WAIVER