RFR: jsr166 jdk9 integration wave 6

[Martin Buchholz]

Easy changes to review, up to April Fools day, in part to make room
for later unfinished more exciting changes.

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