@bug W-2063901@ Fix for not ending context in VarDefImplTest
Merging origin/dchasman/master-pending-varDefImplTestFix into master