OMNIBUS AMENDMENT AND WAIVER AGREEMENT