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

projects/cadcAccessControl/build.xml

...ccessControl/src/ca/nrc/cadc/ac/json/JsonGroupReader.java

...ccessControl/src/ca/nrc/cadc/ac/json/JsonGroupWriter.java

...AccessControl/src/ca/nrc/cadc/ac/json/JsonUserReader.java

...ontrol/src/ca/nrc/cadc/ac/json/JsonUserRequestReader.java

...ontrol/src/ca/nrc/cadc/ac/json/JsonUserRequestWriter.java

...AccessControl/src/ca/nrc/cadc/ac/json/JsonUserWriter.java

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

.../cadcAccessControl/src/ca/nrc/cadc/ac/xml/UserReader.java

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

...est/src/ca/nrc/cadc/ac/json/JsonUserReaderWriterTest.java

.../ca/nrc/cadc/ac/json/JsonUserRequestReaderWriterTest.java

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