Merging changes 4100 4103 4107 4116 4117 4120 4122 4125 4127 4129 4130 4133 from trunk

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