First try to fix #1736.
Second try to fix #1736.
Third try to fix #1736.
Third try to fix #1736. Merge with existed test.
Remove unused include.
First try to fix #1571. Propagate shutdown timeout to Executor and CommandExecutor via env variable. Remove escalation constant for command executor.