Merge pull request #13359 from davidxia/increase-docker-kill-timeout

Increase upstart kill timeout to 20 seconds