rebase conflict

	modified:   runtime/execdriver/lxc/lxc_template.go