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

[maurizio.cimadamore at oracle.com]

Changeset: fd69d58290cd
Author:    langtools
Date:      2017-04-13 23:55 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jdk/rev/fd69d58290cd

Automatic merge with default

- src/java.base/share/classes/java/lang/reflect/Layer.java
- src/java.base/share/classes/java/lang/reflect/LayerInstantiationException.java
- src/java.base/share/classes/java/lang/reflect/Module.java
- src/java.base/share/classes/java/lang/reflect/WeakPairMap.java
- src/java.base/share/classes/jdk/internal/misc/JavaLangReflectModuleAccess.java
- test/java/lang/reflect/Layer/BasicLayerTest.java
- test/java/lang/reflect/Layer/LayerAndLoadersTest.java
- test/java/lang/reflect/Layer/LayerControllerTest.java
- test/java/lang/reflect/Layer/layertest/Test.java
- test/java/lang/reflect/Layer/src/m1/module-info.java
- test/java/lang/reflect/Layer/src/m1/p/Main.java
- test/java/lang/reflect/Layer/src/m1/p/Service.java
- test/java/lang/reflect/Layer/src/m2/module-info.java
- test/java/lang/reflect/Layer/src/m2/q/Hello.java
- test/java/lang/reflect/Layer/src/m3/module-info.java
- test/java/lang/reflect/Layer/src/m3/w/Hello.java
- test/java/lang/reflect/Layer/src/m4/impl/ServiceImpl.java
- test/java/lang/reflect/Layer/src/m4/module-info.java
- test/java/lang/reflect/Module/AddExportsTest.java
- test/java/lang/reflect/Module/AnnotationsTest.java
- test/java/lang/reflect/Module/BasicModuleTest.java
- test/java/lang/reflect/Module/WithSecurityManager.java
- test/java/lang/reflect/Module/access/AccessTest.java
- test/java/lang/reflect/Module/access/src/target/module-info.java
- test/java/lang/reflect/Module/access/src/target/p1/Helper.java
- test/java/lang/reflect/Module/access/src/target/p1/Public.java
- test/java/lang/reflect/Module/access/src/target/p2/NonPublic.java
- test/java/lang/reflect/Module/access/src/target/q1/Public.java
- test/java/lang/reflect/Module/access/src/target/q2/NonPublic.java
- test/java/lang/reflect/Module/access/src/test/module-info.java
- test/java/lang/reflect/Module/access/src/test/test/Main.java
- test/java/lang/reflect/Module/addXXX/Driver.java
- test/java/lang/reflect/Module/addXXX/m1/module-info.java
- test/java/lang/reflect/Module/addXXX/m1/p1/C.java
- test/java/lang/reflect/Module/addXXX/m2/module-info.java
- test/java/lang/reflect/Module/addXXX/m2/p2/C.java
- test/java/lang/reflect/Module/addXXX/m2/p2/internal/C.java
- test/java/lang/reflect/Module/addXXX/m3/module-info.java
- test/java/lang/reflect/Module/addXXX/m3/p3/C.java
- test/java/lang/reflect/Module/addXXX/m4/module-info.java
- test/java/lang/reflect/Module/addXXX/m4/p4/C.java
- test/java/lang/reflect/Module/addXXX/test/module-info.java
- test/java/lang/reflect/Module/addXXX/test/test/C.java
- test/java/lang/reflect/Module/addXXX/test/test/Main.java
- test/java/lang/reflect/Module/addXXX/test/test/Service.java
- test/java/lang/reflect/Module/allow.policy
- test/java/lang/reflect/Module/annotation/Basic.java
- test/java/lang/reflect/Module/annotation/src/m/module-info.java
- test/java/lang/reflect/Module/annotation/src/m/p/annotation/Bar.java
- test/java/lang/reflect/Module/annotation/src/m/p/annotation/Baz.java
- test/java/lang/reflect/Module/annotation/src/m/p/annotation/Foo.java
- test/java/lang/reflect/WeakPairMap/Driver.java
- test/java/lang/reflect/WeakPairMap/java.base/java/lang/reflect/WeakPairMapTest.java