solr: remove lookupvar and replace with top scope @ var

Change-Id: Id4157c50e15c7367c95e20b2be34866c98d1493c
Merge "solr: remove lookupvar and replace with top scope @ var" into production