Conflicts:
	software/slaprunner/common.cfg
	software/slaprunner/instance-resilient.cfg.jinja2
	software/slaprunner/instance-runner.cfg