t0m/dellis: Make puppetdb not start when package is installed, fix other ordering issues
t0m/dellis: Make puppetdb not start when package is installed, fix other ordering issues

tim-group/provisioning-tools,tim-group/provisioning-tools