Fix dependency cycle on entropy
Merge branch 'master' of code.dtg.cl.cam.ac.uk:infrastructure/dtg-puppet