Refs #10372 Ask user before discarding changes
Merge branch 'master' into feature/10372_prompt_before_discard_table

Refs #10372

Conflicts:
	Code/Mantid/MantidQt/CustomInterfaces/src/ReflMainViewPresenter.cpp
Refs #10372 Add unit tests for prompt before discarding
Merge remote-tracking branch 'origin/feature/10372_prompt_before_discard_table'