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

[Magnus Ihse Bursie]

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