Set workspaceProperty's workspace name. Re #6171
Merge branch 'master' into bugfix/6171_script_history
Merge branch 'bugfix/6171_script_history' into develop