Rename a package, as it's already declared in another bundle

git-svn-id: https://svn.apache.org/repos/asf/directory/shared/trunk@1630771 13f79535-47bb-0310-9956-ffa450edef68
Fixed a class that was importing a renamed package

git-svn-id: https://svn.apache.org/repos/asf/directory/shared/trunk@1630781 13f79535-47bb-0310-9956-ffa450edef68
Importing a missing package

git-svn-id: https://svn.apache.org/repos/asf/directory/shared/trunk@1630782 13f79535-47bb-0310-9956-ffa450edef68
Fixed the code following the package renaming done previously

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