updates for test cases
Merge branch 'master' into qpid

Conflicts:
	dataset/test_cases/adcpt_m_dspec_recovered.yml
	dataset/test_cases/adcpt_m_log9_recovered.yml