OPENAM-1232 Review: CR-1727

git-svn-id: https://svn.forgerock.org/openam/trunk/openam@5338 0f4defcf-c51a-4c67-9f44-6fb5eba73c5d
OPENAM-2497 CR-1733

git-svn-id: https://svn.forgerock.org/openam/trunk/openam@5339 0f4defcf-c51a-4c67-9f44-6fb5eba73c5d
AME-1785 CR-1718

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

git-svn-id: https://svn.forgerock.org/openam/trunk/openam@5341 0f4defcf-c51a-4c67-9f44-6fb5eba73c5d
AME-1786 CR-1719

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