Merging down range of revisions from am-policy-editor branch (AME 3643, 3742, 3646, 3560)

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