Fixes https://java.net/jira/browse/JAVASERVERFACES-3385, fix test failure on Issue2613IT

git-svn-id: https://svn.java.net/svn/mojarra~svn@13581 761efcf2-d34d-6b61-9145-99dcacc3edf1
Fixes https://java.net/jira/browse/JAVASERVERFACES-3385, fix test failure on Issue2613IT

git-svn-id: https://svn.java.net/svn/mojarra~svn@13582 761efcf2-d34d-6b61-9145-99dcacc3edf1
Fixes https://java.net/jira/browse/JAVASERVERFACES-3386, Backport JAVASERVERFACES-3385 to 2.2.x

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