[richfaces-planning-issues] [JBoss JIRA] (RFPL-2361) Merge patch for RF-12221