Use redis-cli to shutdown redis server

It would appear that the process name as reported by ps has changed, so we
weren't getting a pid to use for kill. This should be more fool-proof.