Fixes for failing tests
Merge branch 'master' of ssh://git@github.com/DawnScience/dawn-test.git

Conflicts:
	org.dawnsci.squishtests/suite_usecases_general/tst_data_reduction_box_profile/test.py
Merge branch 'master' of ssh://git@github.com/DawnScience/dawn-test.git
Correction of stupid merge - re-add box profile reduction test