TEIID-2635 ensuring that popping resets the context store
Merge branch '8.4.x' of https://github.com/teiid/teiid
TEIID-2614 small fix for anon blocks containing dynamic sql