Additional component upgrade to address an incomplete backport of bz1130439.
Verified in EAP 6.3.2.CP.CR2.