Some changes in PuppetDB recently broke logging. Ensure we write logs as before. While here, do some cleanup of the Makefile. With hat: puppet
