Refs #9209 Correct units.
Merge branch 'feature/9209_can_file_in_diffraction' of github.com:mantidproject/mantid into feature/9209_can_file_in_diffraction
Refs #9209 Fix plotting for can subtraction.
Merge branch 'feature/9209_can_file_in_diffraction' into develop