RFR: JDK-8066769 Merge errors following JDK-8049367 (Modular Run-Time Images)

[Erik Joelsson]

Looks good to me.

/Erik

On 2014-12-05 13:40, Magnus Ihse Bursie wrote:
> JDK-8049367 (Modular Run-Time Images) contained large pieces of 
> heavily changed build logic. Getting such a thing in place is not easy.
>
> A few, non-critical, merge errors crept up:
> * Whitespace cleanup disappaeard
> * Improvements in compare.sh were lost.
>
> Bug: https://bugs.openjdk.java.net/browse/JDK-8066769
> WebRev: 
> http://cr.openjdk.java.net/~ihse/JDK-8066769-jigsaw-m2-merge-errors/webrev.01
>
> /Magnus