Bring image up to date

Mostly merging upstream commits, allowing the image to be built. There were no (or very small) performance gains when measured with ab. The true gain comes from putting Varnish in front, and that would happen in the docker-compose project, not here.