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

projects/cadcAccessControl-Admin/build.xml

...ntrol-Admin/src/ca/nrc/cadc/ac/admin/AbstractCommand.java

...ol-Admin/src/ca/nrc/cadc/ac/admin/ContextFactoryImpl.java

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

projects/cadcAccessControl-Admin/test/LdapConfig.properties

...dmin/test/src/ca/nrc/cadc/ac/admin/CmdLineParserTest.java

...ol-Admin/test/src/ca/nrc/cadc/ac/admin/UserAdminTest.java

...cadcAccessControl-Server/config/LdapConfig.dev.properties

...cts/cadcAccessControl-Server/config/LdapConfig.properties

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

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

...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

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

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

.../cadcAccessControl-Server/test/LdapConfig.test.properties

...dcAccessControl-Server/test/config/testConfig1.properties

...dcAccessControl-Server/test/config/testConfig2.properties

.../test/src/ca/nrc/cadc/ac/server/RequestValidatorTest.java