Backport bug 7179796 to JDK 6 and JDK 7

[Michael-O]

Hi,

I reported that issue two month ago. This was fixed for trunk/JDK 8(b51) 
only. Can this trivial fix be backported to JDK 6 and 7 to?

Thanks,

Mike