Merged revisions r515932:540837 from ApacheDS trunk to SASL branch.

git-svn-id: https://svn.apache.org/repos/asf/directory/apacheds/branches/apacheds-sasl-branch@541123 13f79535-47bb-0310-9956-ffa450edef68
575 files changed