Have master-side steps respect the timeout when removing files and directories

This addresses the issue described at <http://trac.buildbot.net/ticket/3055>.