AME-246 CR-1228 FIX for build error

git-svn-id: https://svn.forgerock.org/openam/trunk/openam@4227 0f4defcf-c51a-4c67-9f44-6fb5eba73c5d
AME-366 with CR-1218

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