Requesting approval to push 6998583 changes to 6-open. Already reviewed by Brad. http://cr.openjdk.java.net/~coffeys/webrev.6998583.6open/ regards, Sean.