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

Merge branch feature/jorgen.lind/java_updates with refs/heads/master into refs/merge-requests/184/train
3 jobs for !184 with feature/jorgen.lind/java_updates into master in 5 minutes and 43 seconds (queued for 1 second)
merge train