Add an extra check that histogram minimum is less than maximum when merging
Convert some tabs to spaces to preserve formatting style
Merge pull request #5671 from mark-grimes/addMergeCheck

Fix failure during merge when histogram limits are invalid