Merge branch 'device-mapper-test' into 0.7-staging

Conflicts:
	Dockerfile
	docker/docker.go
	hack/PACKAGERS.md
	hack/make.sh
	hack/make/binary
	hack/make/test
	runtime.go
	runtime_test.go
	server.go
	utils.go
	utils/utils.go
	utils_test.go