the puppet::agent class should default to using the puppet_server defined in the puppet::params class
Fixed merge conflict for puppet_server default