http://sources.forgerock.org/cru/CR-1276 - Fixing bugs found during XUI integration tests

https://bugster.forgerock.org/jira/browse/AME-753

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