rhdedgar Merge pull request #4372 from rhdedgar/disable_v2_zab_check