Added choppers to MARI definition file. Re #6136.
Changed moderator size for MARI. Re #6136.
Merge remote-tracking branch 'origin/feature/6136_instrument_components'