hg: jdk9/sandbox: Merge

[daniel.fuchs at oracle.com]

Changeset: 1863419e4419
Author:    dfuchs
Date:      2016-12-09 15:31 +0000
URL:       http://hg.openjdk.java.net/jdk9/sandbox/rev/1863419e4419

Merge

! make/Javadoc.gmk
! make/common/Modules.gmk