Fix /etc/init/docker.conf patch for Docker 1.10

[adderan]

In docker 1.10, the Upstart docker.conf script has been changed slightly, making the patch fail in toil box.

Docker 1.10: https://github.com/docker/docker/blob/master/contrib/init/upstart/docker.conf

Docker 1.9.1: https://github.com/docker/docker/blob/v1.9.1/contrib/init/upstart/docker.conf

I don't know whether you should actually merge this or not, since you're considering pinning Docker at 1.9.1.

[hannes-ucsc]

I'll definitely want to merge this (in conjunction with pinning Toil to 1.10). Can you say a little more about the symptoms you ran into that triggered you make these changes? Is this a fix for #97 and if not, I wonder why you aren't running into #97.

[adderan]

I did run in to #97, but waited about 5 minutes for the tar to complete, at which point the patch immediately failed. I don't have the exact log output anymore, but it was clear that the patch didn't apply to that version of docker.conf. It works after making this change. But in adaba9a John pins docker-engine to 1.9.1, which will make it necessary to undo this PR.

[hannes-ucsc]

John's commit was cherry-picked into the stable branch as well, so I think the way forward for the master branch is to move the pin to 1.10, merge this PR and fix #97.

John waited in excess of 10 minutes and nothing had happened.