Review request for JDK-8041953

[Hannes Wallnoefer]

Please review JDK-8041953: JDK-8031359.js fails in 8u-dev:

http://cr.openjdk.java.net/~hannesw/8041953/

This fixes a number of merge errors in JDK-8031359.js fails in 8u-dev.

Thanks,
Hannes