Merge pull request #2020 from jlipps/master

add --command-timeout server arg
store --command-timeout as int