Merge branch 's1832' into ac2

...ol-Server/src/ca/nrc/cadc/ac/server/GroupPersistence.java

...l-Server/src/ca/nrc/cadc/ac/server/ldap/LdapGroupDAO.java

.../src/ca/nrc/cadc/ac/server/ldap/LdapGroupPersistence.java

...ol-Server/src/ca/nrc/cadc/ac/server/web/LoginServlet.java

...l-Server/src/ca/nrc/cadc/ac/server/web/WhoAmIServlet.java

...ontrol-Server/src/ca/nrc/cadc/auth/AuthenticatorImpl.java

...t/src/ca/nrc/cadc/ac/server/web/UserLoginServletTest.java

...test/src/ca/nrc/cadc/ac/server/web/WhoAmIServletTest.java