Updating the puppet definition with various module fixes.