mysql-config-research: qualify vars

Change-Id: I9b51bce6fee63c51b917cc138addcd440eb89152
Merge "mysql-config-research: qualify vars" into production