Resubmitted against 1.3.x instead of master.

log4j logfile name was hardcoded to puppetdb. This broke logrotation
which used @name and so was pe-puppetdb on pe installations.