Merge branch 's1651' of /usr/cadc/dev/git/wopencadc into s1651

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

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

...ol-Server/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAO.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

.../cadcAccessControl/src/ca/nrc/cadc/ac/ActivatedGroup.java

projects/cadcAccessControl/src/ca/nrc/cadc/ac/Group.java

...cts/cadcAccessControl/src/ca/nrc/cadc/ac/GroupReader.java

...cts/cadcAccessControl/src/ca/nrc/cadc/ac/GroupWriter.java

...ontrol/test/src/ca/nrc/cadc/ac/GroupReaderWriterTest.java

.../cadcAccessControl/test/src/ca/nrc/cadc/ac/GroupTest.java