Merge branch 'master' into 'master'

Improve proxy handler

See merge request entgra/carbon-device-mgt!595

components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/DefaultTokenHandler.java

@@ -40,12 +40,7 @@ import javax.servlet.http.HttpSession;
 import java.io.IOException;
 
 @MultipartConfig
-@WebServlet(
+@WebServlet("/default-credentials")
-        name = "DefaultTokenHandlerServlet",
-        description = "This servlet intercepts the api requests initiated from the user interface to get the default "
-                + "token",
-        urlPatterns = { "/default-credentials/*" }
-        )
 public class DefaultTokenHandler extends HttpServlet {
     private static final Log log = LogFactory.getLog(DefaultTokenHandler.class);
 

components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/LogoutHandler.java

@@ -18,7 +18,6 @@
 
 package io.entgra.ui.request.interceptor;
 
-import io.entgra.ui.request.interceptor.util.HandlerConstants;
 import io.entgra.ui.request.interceptor.util.HandlerUtil;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;