Update with upstream

this change is mainly motivated by the face that access of variable without a @ prefixed to the front has been deprecated in Puppet 3.2. This pull request brings up in alignment with upstream (puppetlabs) where the issue has already been resolved.