Change Ib4381e092e15834c692b2fd76a2f41bf6fed28dd introduced the
cinder_sigkill_timeout and cinder_restart_wait variables, but the
backports did not introduce these for the upstart scripts.
This patch adds them so that upstart and systemd configurations on
Newton are the same.
Change-Id: If70cfeae64a78fb1a9d126e2677ae4b5c45e08b5