Puppet-lint fixes. Moving conditionals out of resource declarations