Merge bug fix from http://cr.openjdk.java.net/~bpb/8057793/webrev.01/
Fix some comments