Tools: Fully qualify variables for Puppet 3 compatibility

Change-Id: I24ac0ba53d828d751a52e15df5a3cafb5dae1812
Merge "Tools: Fully qualify variables for Puppet 3 compatibility" into production