Building docker-gen from source because I gave up on releasing a binary
Use the docker container name, not image name, as the backend name
Merge branch 'use-container-name' into durp
Merge branch 'durp' into outage-less

Conflicts:
	etcd.tmpl