RFR: backports to 11 missed some changes

[Roman Kennke]

Looks good.

Is this the fix for:
https://bugs.openjdk.java.net/browse/JDK-8216364 ?

If so, have you tried the testcase?

Roman

> http://cr.openjdk.java.net/~roland/shenandoah/jdk11-missed-backport/webrev.00/
> 
> Roland.
>