Update to latest 4.1 code

Putting this as a maybe.

I've ported against 4.0 branch.  There's a fair amount of changes in 4.1 branch and it's non-linear with 4.0 branch so it's harder to figure out which Java check-ins need to be ported.

