JAVASERVERFACES-3540: [PORT to 2.2.x] JAVASERVERFACES-3485

git-svn-id: https://svn.java.net/svn/mojarra~svn@13993 761efcf2-d34d-6b61-9145-99dcacc3edf1