Merge branch 'master' of ssh://gimli2.cadc.dao.nrc.ca/srv/cadc/git/wopencadc into s1530

projects/cadcAccessControl-Server/build.xml

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

...-Server/src/ca/nrc/cadc/ac/server/web/ACSearchRunner.java

...l-Server/src/ca/nrc/cadc/ac/server/web/GroupsServlet.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

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