hg: jdk9/sandbox: Merging recent default changes into jlahoda-jline-branch

[jan.lahoda at oracle.com]

Changeset: 7035b9aa0d29
Author:    jlahoda
Date:      2015-07-02 11:56 +0200
URL:       http://hg.openjdk.java.net/jdk9/sandbox/rev/7035b9aa0d29

Merging recent default changes into jlahoda-jline-branch

! make/CompileJavaModules.gmk
! make/Images.gmk