Re #7341 Add proper name to remote jobs
Merge branch 'master' into feature/7253_workspace_groups_and_dock

Conflicts:
	Code/Mantid/Framework/WorkflowAlgorithms/src/AlignAndFocusPowder.cpp
Re #7253
Merge branch 'feature/7253_workspace_groups_and_dock' into develop