update dependencies for 6.0.4 tag
Merge branch '6.0.x' of https://github.com/bonitasoft/bonita-studio.git
into 6.0.x

Conflicts:
	pom.xml