Fix failing unit tests caused by side-effects and unpredictable test ordering.

git-svn-id: https://svn.forgerock.org/opendj/branches/opendj3-server-dev@11117 41b1ffd8-f28e-4786-ab96-9950f0a78031
OPENDJ-1551 checkpoint : apply patch to ensure compatibility with sdk new Function API and prevents circular dependency problem

git-svn-id: https://svn.forgerock.org/opendj/branches/opendj3-server-dev@11120 41b1ffd8-f28e-4786-ab96-9950f0a78031