Merge remote-tracking branch 'origin/develop' into develop-vuminhkh

Conflicts:
	.gitignore
	alien4cloud-rest-it/src/test/java/alien4cloud/it/utils/websocket/StompClientHandler.java
	alien4cloud-rest-it/src/test/java/alien4cloud/it/utils/websocket/WebSocketClientHandler.java