Updating the puppet cluster definition with assorted bug fixes.