Merge pull request #42 from apache/DIRSERVER-2328

DIRSERVER-2328 - CreateAuthenticator annotation trust manager improve…