hg: jdk9/sandbox: Merge from JDK-8172312-branch

[magnus.ihse.bursie at oracle.com]

Changeset: e7f99ef58603
Author:    ihse
Date:      2017-04-13 10:59 +0200
URL:       http://hg.openjdk.java.net/jdk9/sandbox/rev/e7f99ef58603

Merge from JDK-8172312-branch

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