Merge branch 'ac2' of ssh://gimli2/srv/cadc/git/wopencadc into ac2

Conflicts:
	projects/cadcAccessControl-Server/test/LdapConfig.test.properties
	projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAOTest.java