adapting conf.erb to redis >2.4
including /etc/redis/conf.d/*.conf (on debian), /etc/redis_conf.d (on redhat)
adding PUPPET MANAGED tags, and indenting