Merge branch '3458-diffractometer-add-new-k6c-zaxis-geometries' into 'master'
Resolve "diffractometer: add new k6c, zaxis geometries"
Closes #3458 (closed)
See merge request !4812 (merged)
(cherry picked from commit ca2fd905)
49c37358 diffractometer: add k6c and zaxis geometries