TEIID-2714 further refining defrag behavior