solr: qualify vars

Change-Id: Iabd67ddc57a10433f7c222750fe8853603b0bbd8
Merge "solr: qualify vars" into production