Make the shutdown timeout configurable.
Merge bug26402
merge default into bug26396