* changes:
merge Tether{Down,Up}stream4{Key,Value} - part 3 - fixups
merge Tether{Down,Up}stream4{Key,Value} - part 2 - java
merge Tether{Down,Up}stream4{Key,Value} - part 1 - C portion
* changes:
merge Tether{Down,Up}stream4{Key,Value} - part 3 - fixups
merge Tether{Down,Up}stream4{Key,Value} - part 2 - java
merge Tether{Down,Up}stream4{Key,Value} - part 1 - C portion