Merge branch 'ac2' of /srv/cadc/git/wopencadc into s1832

projects/cadcAccessControl-Server/build.xml

...rol-Server/src/ca/nrc/cadc/ac/server/UserPersistence.java

...ontrol-Server/src/ca/nrc/cadc/ac/server/ldap/LdapDAO.java

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

...r/src/ca/nrc/cadc/ac/server/ldap/LdapUserPersistence.java

...c/ca/nrc/cadc/ac/server/web/users/AbstractUserAction.java

...er/src/ca/nrc/cadc/ac/server/web/users/GetUserAction.java

...rc/ca/nrc/cadc/ac/server/web/users/UserActionFactory.java

...rver/src/ca/nrc/cadc/ac/server/web/users/UserServlet.java

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

...rver/test/src/ca/nrc/cadc/ac/server/ldap/LdapDAOTest.java

...test/src/ca/nrc/cadc/ac/server/ldap/LdapGroupDAOTest.java

.../test/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAOTest.java

...rc/ca/nrc/cadc/ac/server/web/users/GetUserActionTest.java

...sControl/src/ca/nrc/cadc/ac/xml/AbstractReaderWriter.java

...ontrol/test/src/ca/nrc/cadc/ac/client/UserClientTest.java