Conditionally validate params; fix syntax error

In the base class, the puppet_server and filebucket_server are optional,
and should only be validated if they're present.  This commit adds a
condition around this.

Add a missing comma to class parameters in pe_server::master