docker: merge kalibro and mezuro containers into one

Conflicts:
	docker/kalibro/Dockerfile-gatekeeper.erb
	docker/kalibro/Dockerfile.erb