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

...Server/src/ca/nrc/cadc/ac/server/GroupDetailSelector.java

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

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

.../src/ca/nrc/cadc/ac/server/ldap/LdapGroupPersistence.java

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

.../src/ca/nrc/cadc/ac/server/web/groups/ACSearchRunner.java

...er/src/ca/nrc/cadc/ac/server/web/groups/GroupServlet.java

...ca/nrc/cadc/ac/server/web/groups/GroupsActionFactory.java

...c/ca/nrc/cadc/ac/server/web/groups/ModifyGroupAction.java

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

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

...adcAccessControl/src/ca/nrc/cadc/ac/client/GMSClient.java

...ccessControl/src/ca/nrc/cadc/ac/client/GMSClientMain.java

...ca/nrc/cadc/ac/client/JSONUserListInputStreamWrapper.java

...ca/nrc/cadc/ac/client/JsonUserListInputStreamWrapper.java

...Control/test/src/ca/nrc/cadc/ac/client/GMSClientTest.java

...rc/cadc/ac/client/JsonUserListInputStreamWrapperTest.java

...ontrol/test/src/ca/nrc/cadc/ac/client/UserClientTest.java