hg: amber/amber/jdk: Automatic merge with default

[maurizio.cimadamore at oracle.com]

Changeset: 96ed10afa4db
Author:    langtools
Date:      2017-05-12 01:27 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jdk/rev/96ed10afa4db

Automatic merge with default

- test/sample/TEST.properties
- test/sample/chatserver/ChatTest.java
- test/sample/mergesort/MergeSortTest.java
- test/tools/launcher/modules/listmods/src/java.transaction/javax/transaction/atomic/Atomic.java