hg: jdk9/sandbox/jdk: Merge

[magnus.ihse.bursie at oracle.com]

Changeset: e4601e01664b
Author:    ihse
Date:      2016-11-17 09:04 +0100
URL:       http://hg.openjdk.java.net/jdk9/sandbox/jdk/rev/e4601e01664b

Merge

- src/java.base/unix/native/libjli/ergo.c
- src/java.base/unix/native/libjli/ergo.h
- src/java.base/unix/native/libjli/ergo_i586.c
- test/java/util/Locale/LocaleTestFmwk.java
- test/javax/net/ssl/templates/SSLSocketSample.java
! test/javax/net/ssl/templates/SSLSocketTemplate.java
- test/javax/net/ssl/templates/SSLTest.java
- test/sun/net/www/http/HttpClient/RetryPost.sh
- test/sun/tools/jps/JpsBase.java
- test/sun/tools/jps/TestJpsClass.java
- test/sun/tools/jps/TestJpsJar.java
- test/sun/tools/jps/TestJpsJarRelative.java