Simple backport from jdk8, test bug, one line changed.
Bug: https://bugs.openjdk.java.net/browse/JDK-7186887Integrated into jdk8 as: http://hg.openjdk.java.net/jdk8/jdk8/langtools/rev/79fd9cfa55f2
Webrev available: http://cr.openjdk.java.net/~kizune/8035762/webrev.00 Reviewed by: Jonathan Gibbons and Kumar Srinivasan The label 7u60-critical-request on the backport issue (8035762) is set. /Alex