master - fixed merge conflicts

cadcAccessControl-Admin/build.xml

...ntrol-Admin/src/ca/nrc/cadc/ac/admin/AbstractCommand.java

...rol-Admin/src/ca/nrc/cadc/ac/admin/AbstractListUsers.java

...l-Admin/src/ca/nrc/cadc/ac/admin/AbstractUserCommand.java

...ssControl-Admin/src/ca/nrc/cadc/ac/admin/ApproveUser.java

...Control-Admin/src/ca/nrc/cadc/ac/admin/CmdLineParser.java

...Control-Admin/src/ca/nrc/cadc/ac/admin/CommandRunner.java

...trol-Admin/src/ca/nrc/cadc/ac/admin/ListUserRequests.java

...cessControl-Admin/src/ca/nrc/cadc/ac/admin/ListUsers.java

cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/Main.java

...essControl-Admin/src/ca/nrc/cadc/ac/admin/RejectUser.java

...ccessControl-Admin/src/ca/nrc/cadc/ac/admin/ViewUser.java

...dmin/test/src/ca/nrc/cadc/ac/admin/CmdLineParserTest.java

cadcAccessControl-Server/build.xml

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

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

...ntrol-Server/src/ca/nrc/cadc/ac/server/PluginFactory.java

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

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

...er/src/ca/nrc/cadc/ac/server/ldap/LdapConnectionPool.java