Merge branch 'ibm-witsml' into 'master'

ibm witsml changes

See merge request !21

(cherry picked from commit 2d6b7aa9)

f2ff77ff ibm witsml changes
3 jobs for cherry-pick-2d6b7aa9