Checkpoint because I'm not working on this anymore right now.
Merge remote-tracking branch 'icsi/topic/seth/tftp' into topic/vladg/tftp