Move reset timeout from global before to session before
Merge pull request #2198 from d0lfin/master

Move reset timeout from "global before" to "session before"