zuul: remove lookupvar and replace with same scope @ var

Change-Id: Ia23437b2aa047b1033feab9a339925bb3abfacaf
Merge "zuul: remove lookupvar and replace with same scope @ var" into production