[HB,CB]{test after code} Added Unregister Servlet and clean ups