define timeout as max(SystemTimeout, maxCommandTimeout)
define timeout for AddNode on Jail as 5 min + fix some logs
Merge remote-tracking branch 'refs/remotes/origin/master'