TEIID-2635 ensuring that popping resets the context store