gerrit apache template - qualify vars

Change-Id: I88cf67379e3b66719e86d555eaba9d58f91ebbdc
Merge "gerrit apache template - qualify vars" into production