JGRP-1698 Bypass on FLUSH

Master only. No new tests added as the fix is fairly simple.