hg: jdk9/sandbox/jdk: Merge

[naoto.sato at oracle.com]

Changeset: 1524ffcc15eb
Author:    naoto
Date:      2015-06-09 13:47 -0700
URL:       http://hg.openjdk.java.net/jdk9/sandbox/jdk/rev/1524ffcc15eb

Merge

! src/java.base/share/classes/sun/util/locale/provider/LocaleNameProviderImpl.java
! src/java.base/share/classes/sun/util/locale/provider/TimeZoneNameProviderImpl.java
! src/jdk.localedata/share/classes/sun/text/resources/en/SG/FormatData_en_SG.java
! test/sun/text/resources/LocaleDataTest.java
- test/sun/tools/jmap/heapconfig/LingeredApp.java
- test/sun/tools/jmap/heapconfig/LingeredAppTest.java