merge revisions 1433542,1448215,1448221,1449029,1449777,1451580,1455392,1461879,1461883,1461890,1461893,1461916,1462113,1467143 until make 2.2.x trunk

git-svn-id: https://svn.apache.org/repos/asf/myfaces/core/trunk@1468663 13f79535-47bb-0310-9956-ffa450edef68