[richfaces-planning-issues] [JBoss JIRA] (RFPL-2418) CLONE - Cherry pick the issue commits from upstream branches