Some template variables were erroneously using @

Alessandro,

  AFAIK, "@" should be used in a template to reference variables that are passed from puppet to the template, but not to variables created INSIDE the tempalte (as in loops). Due to this, many of the templates, when parsed, generated empty strings.

This patch corrects that.

Regards, Javier