Merge branch 'ac2' of ssh://gimli2/srv/cadc/git/wopencadc into ac2

projects/cadcAccessControl-Admin/build.xml

projects/cadcAccessControl-Admin/scripts/userAdmin

...l-Admin/src/ca/nrc/cadc/ac/admin/AbstractUserCommand.java

...ssControl-Admin/src/ca/nrc/cadc/ac/admin/ApproveUser.java

...Control-Admin/src/ca/nrc/cadc/ac/admin/CmdLineParser.java

...adcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/Main.java

...ccessControl-Admin/src/ca/nrc/cadc/ac/admin/ViewUser.java

projects/cadcAccessControl-Admin/test/LdapConfig.properties

projects/cadcAccessControl-Admin/test/scripts/userAdminTest

...st/src/ca/nrc/cadc/ac/admin/integration/AdminIntTest.java

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

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

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

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

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

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