OMNIBUS WAIVER AND MODIFICATION AGREEMENT