Increase upstart kill timeout to 20 seconds Upstream-commit: 76a5fb3e1e329bf38ee6aca29bbe6f3b1b8188c6 Component: engine