s1734 Merged ac2 into this branch and fixed merge conflicts.

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

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

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

...src/ca/nrc/cadc/ac/server/web/users/GetUserIDsAction.java

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

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

...ver/src/ca/nrc/cadc/ac/server/web/users/UsersServlet.java

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

...ca/nrc/cadc/ac/server/web/users/GetUserIDsActionTest.java