ENTESB-2082 - Use our own default session timeout (revisited)