RFR: 7169257: Fix for 6424631 only partially ported to JDK 7 & JDK 8

[Seán Coffey]

Recently noticed that the 6424631 fix was not fully ported to the JDK 7 
workspace. Porting the changes (to 8 & 7) so that no regression is seen 
for users migrating to latest JDK families.

bug report : http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=7169257
webrev : http://cr.openjdk.java.net/~coffeys/webrev.7169257.jdk8/

regards,
Sean.