Merge branch 's1890' of ssh://gimli2/srv/cadc/git/ac into s1885

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

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

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

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

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

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

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

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

...st/src/ca/nrc/cadc/ac/json/JsonGroupReaderWriterTest.java

...ol/test/src/ca/nrc/cadc/ac/xml/GroupReaderWriterTest.java

...test/src/ca/nrc/cadc/ac/xml/UserListReaderWriterTest.java

...Tomcat/src/ca/nrc/cadc/tomcat/CadcBasicAuthenticator.java