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

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

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

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

...r/src/ca/nrc/cadc/ac/server/ldap/LdapUserPersistence.java

...src/ca/nrc/cadc/ac/server/web/users/CreateUserAction.java

...er/src/ca/nrc/cadc/ac/server/web/users/GetUserAction.java

...ver/src/ca/nrc/cadc/ac/server/web/users/LoginServlet.java

...src/ca/nrc/cadc/ac/server/web/users/ModifyUserAction.java

...rver/src/ca/nrc/cadc/ac/server/web/users/UsersAction.java

...c/ca/nrc/cadc/ac/server/web/users/UsersActionFactory.java

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

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

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

...ca/nrc/cadc/ac/server/web/users/ModifyUserActionTest.java

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

...essControl/src/ca/nrc/cadc/ac/json/UserRequestReader.java