Update configuration file check in cdt-stage to look for conductor.yml instead of conductor.cfg.xml
Merge remote-tracking branch 'origin'

Conflicts:
	bin/cdt-stage