OpenAM-2254 CR-1556

git-svn-id: https://svn.forgerock.org/openam/trunk/openam@5059 0f4defcf-c51a-4c67-9f44-6fb5eba73c5d
OpenAM-2056 CR-1557

git-svn-id: https://svn.forgerock.org/openam/trunk/openam@5060 0f4defcf-c51a-4c67-9f44-6fb5eba73c5d
CR-1555 Needed for OpenIB Build

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