SVY-6929: one websocketendpoint per application
Merge remote-tracking branch 'origin/master' into SVY-6929

Conflicts:
	sablo/.settings/org.eclipse.wst.common.component