Merge fixes from master
JDF-420 Update Update Richfaces to 4.3.3.Final