Fix ProfileAdminService

Fix ProfileAdminService
Merge pull request #1533 from CarlosManias/java-fix-tests-and-cleanup

Java fix tests and cleanup