The excessively confusing back-and-forth logic of backtracing the value of wtimeout/w/... is no longer there and replaced with very simple all in one place really.

I did replace few other tests for skipif pre 2.5 and a -26 specific version. You want that for this test too?