The fix for ASPATCH-285 (JBAS-4075) was applied after EAP was forked from Branch_4_2. A quick inspection suggests that part of the fix has not been applied to the EAP codebase.

Specifically, the changes made in revision #60349 don't seem to be present in EAP.

Please see that the fix is applied, or justify its absence.