Merge pull request #1225 from jmaas/master

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