Use the ByteBufAllocator when possible
Remove unused package private classes
Merge remote-tracking branch upstream/$:{upbranch}