Merge branch 'tianon-separate-dockerinit' into dm

Conflicts:
	runtime_test.go