hg: amber/amber: Automatic merge with default

[maurizio.cimadamore at oracle.com]

Changeset: 2b2f7f718910
Author:    mcimadamore
Date:      2018-05-03 22:06 +0200
URL:       http://hg.openjdk.java.net/amber/amber/rev/2b2f7f718910

Automatic merge with default

- src/hotspot/share/gc/g1/bufferingOopClosure.hpp
- src/java.net.http/share/classes/jdk/internal/net/http/common/ByteBufferPool.java
- src/java.net.http/share/classes/jdk/internal/net/http/common/ByteBufferReference.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/DeferredAttr.java
- test/hotspot/gtest/gc/g1/test_bufferingOopClosure.cpp
- test/hotspot/jtreg/runtime/SharedArchiveFile/DefaultUseWithClient.java
- test/hotspot/jtreg/runtime/appcds/SharedArchiveFile.java
- test/hotspot/jtreg/runtime/appcds/UseAppCDS.java
- test/hotspot/jtreg/runtime/constantPool/ACCModule52.java
- test/hotspot/jtreg/runtime/constantPool/ConstModule.java