Merge branch 'master' into feature/8557_SNSvsISIS
refs #8557 Modified convToEnergy to show SNS/ISIS differences clearly

There are no changes to how the code run, but it has been modified to allow clear separation between SNS and ISIS related workflows - these changes make the difference explicit and allow easily modify the code to run foreign reduction.
Merge branch 'feature/8557_SNSvsISIS' into develop