do not enforce context-specific timeout here

And only set timeout if defined. This is enough to fix tests.
keep inventory defaut timeout here