AME-407 / CR-1293, as well as additional Function Objects. For Sprint 18.

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