LUCENE-6454: Added distinction between member variable and method in expression helper VariableContext (merged r1677022)