[richfaces-planning-issues] [JBoss JIRA] (RFPL-2346) Merge RF-12363 qa branch into master