Merge branch 'ac2' into s1657

projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/users/LoginServlet.java

@@ -100,7 +100,7 @@ public class LoginServlet extends HttpServlet
         try
         {
             log.info(logInfo.start());
-            String userID = request.getParameter("userid");
+            String userID = request.getParameter("username");
             String password = request.getParameter("password");
             if (StringUtil.hasText(userID))
             {