Use org.apache.log4j instead of log4j
Merge branch 'master' of github.com:puppetlabs/graph