always include server name as a top level param

this will allow the ability to treat the top level param of 'server_name' in a similar way as a fact which will allow conditional logic on the name