hg: jdk9/sandbox: Merge

[james.laskey at oracle.com]

Changeset: 03b8fd7bb26c
Author:    jlaskey
Date:      2015-05-21 15:46 -0300
URL:       http://hg.openjdk.java.net/jdk9/sandbox/rev/03b8fd7bb26c

Merge

! make/Images.gmk
! modules.xml