Upating for the new year and fixing typos.

git-svn-id: https://svn.forgerock.org/openam@4007 0f4defcf-c51a-4c67-9f44-6fb5eba73c5d
CR-1144; Fix for OPENAM-1976

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