hg: panama/dev: manual merge with nicl

[maurizio.cimadamore at oracle.com]

Changeset: f68728db41b7
Author:    mcimadamore
Date:      2018-05-24 11:44 +0100
URL:       http://hg.openjdk.java.net/panama/dev/rev/f68728db41b7

manual merge with nicl

! src/jdk.jextract/share/classes/com/sun/tools/jextract/Context.java
! test/jdk/com/sun/tools/jextract/JextractToolProviderTest.java