Improve TestKillDifferentUser to prevent timeout on buildbot
Merge pull request #1476 from dotcloud/improve_TestKillDifferentUser

* Tests: Improve TestKillDifferentUser to prevent timeout on buildbot