Back out JGRP-1674 changes to STOP_FLUSH