Puppet stupidness with variablesgit st

Change-Id: Ie625cb5dc084917c7dc5b51829c366b303a51ec8
Merge "Puppet stupidness with variablesgit st"