submodule merge
removed server module from incubator
removed servlet-api from httpunit dependency
Some fixes