Make puppet::server install from puppet topclass
Fix rename of server variable in env