Merge branch feature/jorgen.lind/javafixup with refs/heads/master into...

Merge branch feature/jorgen.lind/javafixup with refs/heads/master into refs/merge-requests/248/train
3 jobs for !248 with feature/jorgen.lind/javafixup into master in 6 minutes and 34 seconds (queued for 1 second)
merge train