Catch up with trunk.

git-svn-id: https://svn.forgerock.org/openam@4115 0f4defcf-c51a-4c67-9f44-6fb5eba73c5d