hg: jdk9/sandbox: Merge

[magnus.ihse.bursie at oracle.com]

Changeset: a14b540c2af8
Author:    ihse
Date:      2017-05-18 09:45 +0200
URL:       http://hg.openjdk.java.net/jdk9/sandbox/rev/a14b540c2af8

Merge

! make/Docs.gmk
! make/Main.gmk