Merge branch 'master' into feature/9699_support_tfxa_and_tosca1

Refs #9699
Correct TFXA short name

Refs #9699
Remove live data address for TFXA

Refs #9699
Remove default rebinning, correct monitor numbers

Refs #9699
Remove TOSCA grouping from TFXA

Refs #9699
Merge branch 'feature/9699_support_tfxa_and_tosca1' into develop