Add puppetlabs/puppetdb and use latest apache module