Merge pull request #1224 from jmaas/release26

Module manage_in_tftpd.py now returns 'in_tftpd'  from what().