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

[maurizio.cimadamore at oracle.com]

Changeset: d3bc265f69a3
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-06-16 11:44 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jdk/rev/d3bc265f69a3

Automatic merge with condy

- test/java/nio/file/Files/walkFileTree/PrintFileTree.java
- test/java/nio/file/Files/walkFileTree/find.sh
- test/java/util/Arrays/ParallelPrefix.java
- test/java/util/ResourceBundle/modules/appbasic/src/test/jdk/test/resources/MyResourcesProvider.java
- test/java/util/ResourceBundle/modules/appbasic2/src/test/jdk/test/resources/MyResourcesProvider.java
- test/java/util/ResourceBundle/modules/basic/src/mainbundles/jdk/test/resources/MyResourcesProvider.java
- test/java/util/ResourceBundle/modules/simple/src/bundles/jdk/test/resources/MyResourcesProvider.java
- test/java/util/ResourceBundle/modules/visibility/src/exported.named.bundles/jdk/test/resources/exported/classes/MyResourcesProvider.java
- test/java/util/ResourceBundle/modules/visibility/src/named.bundles/jdk/test/resources/classes/MyResourcesProvider.java
- test/java/util/ResourceBundle/modules/visibility/src/named.bundles/jdk/test/resources/props/MyResourcesProvider.java
- test/java/util/ResourceBundle/modules/xmlformat/src/bundles/jdk/test/resources/MyResourcesProvider.java
- test/sun/net/InetAddress/nameservice/dns/cname.sh
- test/sun/net/ftp/MarkResetTest.sh
- test/sun/net/www/protocol/file/DirPermissionDenied.sh
- test/sun/net/www/protocol/jrt/other_resources.sh