Merge remote-tracking branch 'origin/feature/8508_discrete_rotational_diffusion'
Merge remote-tracking branch 'origin/feature/8263_tube_calib_examples'
refs #8609 modified Mari to avoid diagnostics completely.
refs #8609 Allow to drop diagnostics for all ISIS inelastic instrum.
Merge branch 'feature/8609_dropDiagnostics' into develop