refs #7082. Port to new api.
refs #7082. Move location.
refs #7082. Add unit test for MergeCalFilesTest.

In the process discover that the algorithm was actually broken, so fix that too and add tests for the broken->fixed cases.!
Merge branch 'feature/7082_merge_cal_files' into develop