JAVASERVERFACES-3458:Port JAVASERVERFACES-3454 to trunk

git-svn-id: https://svn.java.net/svn/mojarra~svn@13700 761efcf2-d34d-6b61-9145-99dcacc3edf1
JAVASERVERFACES-3459:Port JAVASERVERFACES-3454 to 2.2.x

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