Merge tnftp-20100108 from the vendor branch into head.

PR: bin/112288 bin/120256 bin/129014 bin/145528
MFC after: 1 month