Test IntAllocator
Cure off-by-one error in IntAllocator
Differentiate between handling channel id allocation and maintaining state
merge bug25558 into stable