hg: amber/amber/jdk: Automatic merge with constant-folding

[maurizio.cimadamore at oracle.com]

Changeset: 4585bfbbc76e
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-06-30 00:04 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jdk/rev/4585bfbbc76e

Automatic merge with constant-folding

- make/src/classes/build/tools/docs/GenDocsBundlePage.java
- make/src/classes/build/tools/docs/docs-bundle-page.html
- make/src/classes/build/tools/docs/docs-module-groups.properties
! src/java.base/share/classes/java/lang/invoke/MethodHandles.java
- src/java.instrument/share/classes/java/lang/instrument/package.html
- test/java/util/ServiceLoader/modules/BadProvidersTest.java
- test/java/util/ServiceLoader/modules/Basic.java
- test/java/util/ServiceLoader/modules/badfactories/badreturntype/ProviderFactory.java
- test/java/util/ServiceLoader/modules/badfactories/classnotpublic/ProviderFactory.java
- test/java/util/ServiceLoader/modules/badfactories/classnotpublic/Service.java
- test/java/util/ServiceLoader/modules/badfactories/methodnotpublic/ProviderFactory.java
- test/java/util/ServiceLoader/modules/badfactories/methodnotpublic/Service.java
- test/java/util/ServiceLoader/modules/badfactories/returnsnull/ProviderFactory.java
- test/java/util/ServiceLoader/modules/badfactories/returnsnull/Service.java
- test/java/util/ServiceLoader/modules/badfactories/throwsexception/ProviderFactory.java
- test/java/util/ServiceLoader/modules/badfactories/throwsexception/Service.java
- test/java/util/ServiceLoader/modules/badproviders/ctornotpublic/Provider.java
- test/java/util/ServiceLoader/modules/badproviders/ctornotpublic/Service.java
- test/java/util/ServiceLoader/modules/badproviders/notasubtype/Provider.java
- test/java/util/ServiceLoader/modules/badproviders/notpublic/Provider.java
- test/java/util/ServiceLoader/modules/badproviders/notpublic/Service.java
- test/java/util/ServiceLoader/modules/badproviders/throwsexception/Provider.java
- test/java/util/ServiceLoader/modules/badproviders/throwsexception/Service.java
- test/java/util/ServiceLoader/modules/modules/bananascript/module-info.java
- test/java/util/ServiceLoader/modules/modules/bananascript/org/banana/BananaScript.java
- test/java/util/ServiceLoader/modules/modules/bananascript/org/banana/BananaScriptEngineFactory.java
- test/java/util/ServiceLoader/modules/modules/test1/module-info.java
- test/java/util/ServiceLoader/modules/modules/test1/p/ProviderFactory.java
- test/java/util/ServiceLoader/modules/modules/test1/p/Service.java
- test/java/util/ServiceLoader/modules/modules/test2/module-info.java
- test/java/util/ServiceLoader/modules/modules/test2/p/Provider.java
- test/java/util/ServiceLoader/modules/modules/test2/p/Service.java
- test/java/util/ServiceLoader/modules/src/pearscript/META-INF/services/javax.script.ScriptEngineFactory
- test/java/util/ServiceLoader/modules/src/pearscript/org/pear/PearScript.java
- test/java/util/ServiceLoader/modules/src/pearscript/org/pear/PearScriptEngineFactory.java
- test/lib/testlibrary/jdk/testlibrary/Platform.java
- test/tools/launcher/modules/permit/AttemptAccess.java
- test/tools/launcher/modules/permit/PermitIllegalAccess.java