Merge remote-tracking branch 'origin/feature/7082_merge_cal_files'
re #7082 remove logging left over from debugging
re #7116 Change xml header for Cansas1d v2
Merge branch 'feature/7116_UpdateCanSAS1DHeader' into develop