Merge branch feature/camille.perin/javaFixes with refs/heads/master into...

Merge branch feature/camille.perin/javaFixes with refs/heads/master into refs/merge-requests/134/train
3 jobs for !134 with feature/camille.perin/javaFixes into master in 2 minutes and 57 seconds (queued for 1 second)
merge train