Merge remote-tracking branch 'origin/master' into SVY-6929

Conflicts:
	sablo/src/main/resources/META-INF/resources/sablo/js/websocket.js