Review request backport 8210386

[Johan Vos]

Hi Kevin,

Please review the backport of 8210386 (Marlin fixes) into 11-dev (target
11.0.1)
http://cr.openjdk.java.net/~jvos/8210386/webrev.00/

- Johan