Merge pull request #474 from stefk/display-name

Added comment and simplified statement (closes #455)
Don't use display name with tools in additional installer
Merge pull request #476 from maxailloud/new_workspace_badge_tool

Don't use display name with tools in additional installer
Removed wrong listener annotation
Merge pull request #480 from stefk/di-fix

Removed wrong listener annotation
Merge branch 'master' into test-revert-patch

Conflicts:
	Library/Installation/Updater/Updater021101.php