Puppet master declaration refactoring (new puppet::server class)