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

[maurizio.cimadamore at oracle.com]

Changeset: ad9246e84dfb
Author:    langtools
Date:      2017-05-05 20:56 +0200
URL:       http://hg.openjdk.java.net/amber/amber/hotspot/rev/ad9246e84dfb

Automatic merge with default

! src/share/vm/interpreter/linkResolver.cpp