RFR: jsr166 jdk10 integration wave 3

[Martin Buchholz]

http://cr.openjdk.java.net/~martin/webrevs/openjdk10/jsr166-integration/

Our usual webrev, rejiggered for the consolidated repo.

David, this includes your nestmates changes.