Some of the changes for the 1.2 fix,

4146449 certain private static fields might as well be marked "final"

should be backported to 1.1.8