beginning of change to allow multiple file comparisons per test case
Merge branch 'origin/Master-both' of https://github.com/JFrei86/HWserver into origin/Master-both