Drop the servlet/feature-pack, servlet-build and servlet-dist modules. Change testsuite uses thereof the use either wildfly fp or wildfly-ee and dist/build or ee-dist/ee-build, with which controlled by the same properties that we use elsewhere to choose between wildfly and wildfly-ee.