hg: jdk9/sandbox/jdk: merge

[stuart.marks at oracle.com]

Changeset: 950616403aff
Author:    smarks
Date:      2014-12-16 14:13 -0800
URL:       http://hg.openjdk.java.net/jdk9/sandbox/jdk/rev/950616403aff

merge

- test/javax/swing/JComboBox/ConsumedEscTest/ConsumedEscTest.java