Merging out revision 9857 prior to re-integrate merge

git-svn-id: https://svn.forgerock.org/openam/trunk@9875 0f4defcf-c51a-4c67-9f44-6fb5eba73c5d
AME-3719 Merging all changes from my branch in to trunk.

git-svn-id: https://svn.forgerock.org/openam/trunk@9880 0f4defcf-c51a-4c67-9f44-6fb5eba73c5d
OPENAM-4191-Numeric actionValues
CR-4090

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