Merge branch feature/jorgen.lind/JuliensJavaPatchesRebase with...

Merge branch feature/jorgen.lind/JuliensJavaPatchesRebase with refs/heads/master into refs/merge-requests/417/train
3 jobs for !417 with feature/jorgen.lind/JuliensJavaPatchesRebase into master in 29 minutes and 50 seconds (queued for 2 seconds)
merge train