merge revisions 1423194-1432818 from trunk

git-svn-id: https://svn.apache.org/repos/asf/myfaces/core/branches/2.1.x-client-window@1433517 13f79535-47bb-0310-9956-ffa450edef68