Merge branch 'master' into feature/8912_CLI_new_branch_to_solve_conflicts

trying to catch conflict in mantidplotpy
Merge branch 'feature/8912_CLI_new_branch_to_solve_conflicts' into develop