remove references to server.xml fragments from server.xml templates, rdavies