Applied the package changes exposed in DIRAPI-212

git-svn-id: https://svn.apache.org/repos/asf/directory/shared/trunk@1646475 13f79535-47bb-0310-9956-ffa450edef68
Committing the classes impacted by DIRAPI-212 change

git-svn-id: https://svn.apache.org/repos/asf/directory/shared/trunk@1646477 13f79535-47bb-0310-9956-ffa450edef68
Fixed the exports and imports following the changes done for DIRAPI-212

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