hg: amber/amber: Automatic merge with default

[maurizio.cimadamore at oracle.com]

Changeset: 980059225fb8
Author:    mcimadamore
Date:      2017-11-10 18:49 +0100
URL:       http://hg.openjdk.java.net/amber/amber/rev/980059225fb8

Automatic merge with default

! make/common/MakeBase.gmk
! make/test/JtregNativeJdk.gmk
- src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/PropertyListeners.java