s1885 - fixed merge conflicts

...er/src/ca/nrc/cadc/ac/server/ldap/LdapConnectionPool.java

...erver/src/ca/nrc/cadc/ac/server/ldap/LdapConnections.java

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

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

...erver/src/ca/nrc/cadc/ac/server/ldap/LdapPersistence.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/groups/ModifyGroupAction.java

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

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