Applied patch from DIRSERVER-1889

git-svn-id: https://svn.apache.org/repos/asf/directory/apacheds/trunk@1520988 13f79535-47bb-0310-9956-ffa450edef68