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

Merge branch feature/jorgen.lind/java_cmake with refs/heads/master into refs/merge-requests/140/train
3 jobs for !140 with feature/jorgen.lind/java_cmake into master in 2 minutes and 51 seconds
merge train